Love your analysis! Just wanted to say something in defense of Harry's bad temper in OotP. Not only was he suffering under all the things you mentioned - consider Umbridge! - but, with that mental/emotional connection to Voldemort, he was almost always receiving some bad vibes. It's a wonder he wasn't nastier.