Frank, EXCELLENT post, one I needed to read today. I really LOVE the way you handled that sitch. I have had cause to do similar things and in each case, the response was positive.
The point is that you CAN stand up for yourself without anger or defensiveness and that's what you did. You spoke your mind and in doing so, encouraged your W to as well.
I am really glad to hear your sitch is still improving.