W continues to be in her crappy mood. Nothing new there. I remain consistent in my demeanor around her. Friendly but distant.
Emphasis on the friendly. Be the person that you'd want to be if she was acting the way you'd expect. If she is going to do her own 180s and turn back fully and loving to you, she needs to see a 'you' that she can love. That takes time and she may continue to test you with random comments and arguments to test your resolve.
I find it very hard to be polite when D is on my mind. The lists of things that a D brings up are hard to put down. If you see her as in a crappy mood, are you sure it isn't converting friendly into just distant?