I, too, feel it would be better if Dumbledore didn't discover about Harry's sight (at least by Hermione). Maybe you could make a situation where Harry has him swear by his magic at the end of the year and then expain to him about it. Though even then I don't think Harry would put up with dumbledore's manipulations.
Great work so far!!!!