You sound a bit better, have you checked your goals lately, they'll help you stay on track.
The main thing I see is that he is getting a reaction out of you when he is grumpy. That is his payoff. You need to not react to this negativity. Force your spunky self! Remember your old thread, accentuate the positive.