So just casually strolling through Facebook and….
"Richard couldn’t have got all angry in the goblet of fire at harry or any of the books onwards. His voice was too calm and nice. The battle of hogwarts would have been completely different."
Don’t think Dumbledore in the books was ever even remotely angry at Harry, mayybe mildly disappointed but not angry. Plus, where did Dumbledore appear in the battle of Hogwarts apart from in Snapes memory?