Hi fb2 - You sound like you are doing a great job. Not everything is going to be perfect, but definite forward motion.
Good job in not reacting to Ws jabs at you. She is looking for that reaction. She needs to be able to justify what she's doing and everything you do wrong, is a point in her favor as far as she's concerned.
I guess it depends on the W, but if she's being bitter, humor may only make her think that you are making light of her issue. Maybe (in that specific instance) "i understand how that could bother you, but they really all had a wonderful trip so it wasn't really a big deal at the time." I don't know.
Keep rolling along. You sound like you are doing well and making some great baby steps with W.
If i can't fall in love... I'd like to fall in chocolate! ~ Author Unknown