I'm at 16.5 hours for the month so far, so right on track.
I'm currently about a third of the way through the rewrite. I wound up making massive changes to one chapter, and that took a while. I've also shuffled the order of a few chapters, to try to get the external action of the story going earlier in the book.
I'm hoping to be done by the end of the month, but we'll see. As long as I'm working a reasonable number of hours a month, I'm going to try and not get impatient about my progress. It isn't even a year since I started writing the first draft!