Yeah, that was pretty much where my enthusiasm for the books got killed. Of course, that was also the book she murdered Hermione's character, brought Ginny back out from the sidelines, and generally realized she'd fucked up somewhere in the last five books and needed to get the plot back on the rails.

Though I am curious that the trailers I keep seeing have more Harry and Hermione (once where she thwacks him and once where she is sitting really, really close (and alone) with him) so maybe the movies will continue this whole trend of overtly going along with the 'canon' ships and giving the H/Hr fans subtext consistent with, you know, the first five books/movies.