I wrote more of the new chapter 25--it seemed to be taking kind of a long time, so I ran a word count on what I wrote yesterday and today (I don't remember exactly where I stopped yesterday). Anyway, it turns out that I've written 3,550 words, plus quite a bit of editing, so that explains that.
I should be able to finish out chapter 25 tomorrow (it's mostly chopping down the last scene, which now doesn't need to be nearly as long), and then the final chapters don't need that much work.
Then I think I'm going to take a few days off from it and work on some cover and marketing B projects (plus some tax crap). Then I'll read it over, print it out and read it over, and start laying it out.