Well, that's a good end for Severus; he may even come to a better understanding of himself. I suppose I shouldn't be surprised at McGonagall knowing, somehow she doesn't strike me as one this Harry would care to hide something from.
I thought the final scene was well-done. 'Twas an amusing way to tell Hermione the truth; now we get the full story and we see whether or not they can remain as intimate, or moreso, as they've become. I did love Luna's comments there, I wonder how she knew.