That's how I feel when I read the books or watch the movies - sometimes Harry just needs to be slapped. But I hope the ending helped with that impulse, and showed that he's not beyond all hope.
And yes, Severus' amazing forbearance with his situation was due not only to him literally being powerless but also having been there before. I'm glad you could tell that.
I understand not wanting to read angst because of RL, so thank you for reading anyway and commenting. I appreciate it. :)