The one way to show genuine change in how you interact with W is appreciating the moments you DO have with her. Be truly in the moment with W without any worries about how you're behaving or acting around her.
Don't try to grab a mile from an inch. That'll piss W off...as she did recently. How about a smile and say, "I had fun! Thanks for this" and then be the first to leave.
