I'm more or less in the same boat, but still...if I could travel back in time, I'd ask...no, beg, bribe or threaten Sunrise and Taniguchi to either keep the show in its original time slot or to somehow keep the story simple instead of adding more than what they can handle. That kills the pacing, which is not worth it even if it does also have its benefits.
My personal enjoyment of the series is fine, but other than that...a step in the right direction would be to wrap up the final battle in 23-24 and use all of 25 for closure, period.
I hope that's the case, because I'd hate not being able to re-watch this series if the ending (the last 22 minutes) didn't at least make up for some of its failings. Not everything, or even most, but enough.