Loved hearing about your office visit...I think you struck JUST the right note there!
Sounds to me like your H IS feeling the pressure of W and OW converging on the office...his pissy mood earlier was likely NOT due to anything you'd said/done.
Now here's something I thought of re the OW: Is your H her direct boss? Might there be potential ramifications (harassment charges????) if he were to try and dismiss her?
I just wondered if he was feeling that kind of pressure/worry too.