Yes. Book 5 at the latest. I found most of Book 4 a waste of time. The only real purpose of it is to bring Voldie back. Book 5 could have been so, so much better, but it was just too damned long. I actually quite liked HBP - I thought "Aha! She's really got into her writing stride now!" - for the most part, but there was just that bit too much digression and DD doing infodumps.

...And then we got the Snape-Shaped Hole. Pretty much describes Book 7 completely, doesn't it? I think I'll adopt that as the alternate title (in the same way that Star Trek: The Motion Picture rapidly became 'The Slow-Motion Picture' and 'The Colour Slide'!).