The trick to the second one is that McGonagall's way of cheering Harry up is actually going to be quite predictable: she and Dumbledore are likely going to try bringing Harry's parents to Hogwarts.

Huh. I assumed that Quirrell was trying to manipulate someone from the Order into to obliviating Harry to further alienate Harry from Dumbledore's side. Harry hasn't detected himself being obliviated yet, and that needs to happen in the next few chapters. But memory charming Harry to happiness a high entropy guess so I don't have much confidence in it.