Word count has pushed up towards 17k.
I think I am through the most awful chunk of rewriting. The first section had the most to rearrange. The second section is far more straightforward.
I may leave it at that rewrite. I don't believe that I will ever be beyond hating every word that I've written, even if I do occasionally like what I see.