((((Serenity))))
That does sound like what you need to do.... it is a "tough love" approach. You can communicate to your S similar as you would (and probably did) to H at the beginning of your sitch... "I choose you and this R but I won't be treated this way. If you can treat me with respect and love, I want nothing more than to have you live with me. I also love myself, and I need to take care of myself by not letting you treat me this way." Then he knows the door is open in the future if he can change his attitude and behavior towards you.

I agree this will be a wake up call for both S and H and maybe it is about time for both of them!