I like both here. If it had of been Neville, may have been different (three of my favourites in the same section) - but I'll vote for Dumbledore. For now.
Still think it would have made a better story if Dumbledore was evil and just pretending to be a good guy. Book 6 ruined that unfortunately. Was still hoping for it to happen up until then, even if I thought it was very unlikely.
--
~ Ringworm ~