I think the whole thematic thing, or "what is this book really about?" is a useful thing to think of about half way through, and again when doing a fix at the end, and otherwise best left submerged. I've never had to do what you're doing, thank goodness, because I'd be even worse at it.