You had me on tenterhooks from the start. I'm thinking how callous everyone was being about Severus, trying to force Harry to go on vacation. Then, I discover no one but Harry knows about Severus. Now I'm terrified that he'll be forced out leaving Severus alone. (!!)
I start off thinking it's plain agoraphobia with magical causes. Then, I discover that the wounds reopen and he bleeds out if he leaves his room. (!!!)
By the time the castle throws a fit and knocks Harry out, I'm hoping Severus has been released. But, you know, angry non-human entity with childish sense of things. . . Then, Binns says he's returned to the beginning. I'm picturing him bleeding out in the Shack.
I think they both needed a life outside the castle. I'm also thinking the reveal to Minerva and Harry's friends will be pretty interesting.