I read it, you've already stated everything out that needed to be said, he knows that he needs to move out if he doesn't want to be with you, I caution you against moving out of the master bedroom, if he doesn't want to be with you, let him move out of the bedroom and the house, you don't need to make it easier for him.
As for your moods, I say, be you. If you want to be happy, be happy. It's certainly more attractive to be happy than it is to be sad or angry.
You'll attract more bees with honey than vinegar.
You don't have to worry if he gets snippy if you're happy, that's his concern, you just be awesome.
