What I see is you trying to make your W behave the way you want her to behave....
Is he? Or is he trying to (and I grant you, it was too immediate and came across as too angry) communicate EXACTLY the same thing Pearlharbr was, only less elegantly? And that is, "W, this is how you need to behave if you want to be with ME, because I value myself too much to keep allowing myself to be treated this way."
It's a fine communication line, but one that's extremely important. I don't think there's hardly ANYTHING wrong with his message . . . only maybe its TIMING and its DELIVERY.