I think I agree with you. Without realizing she wrote such a beautiful friendship ship which in OOTP converted a lot of people like me who weren't committed to a ship before, especially in a book which implied that the power of love was Harry's greatest weapon against Voldemort (has always bugged me that that really wasn't such a big deal afterward). But there are several noticeable and sudden character changes after that, which is sad since I really liked the characters in OOTP and not really in HBP.

You're also right there. There is a fair H/Hr leaning in the movies, it just isn't because they kept the same reasons for it as in the books.