Get as busy as possible, get tired and you won't have the energy to want to engage H, lol!! Usually works for me.
Don't worry too much about S, I think it will pass. I would go to him rather than him coming to you, if you don't want to set a precedent of him sleeping in your bed. If you don't care then don't worry about it. My S used to have night terrors, but outgrew them.
Also, try wearing him out a little more during the day, see if that helps!
He could just be reacting to all the change as well
