MC is a good idea, but is he personally ready yet? (clean?)
I'm stealing Wllwwlk's thunder here, but try reading Mars/Venus together. This sounds like typical guy/girl stuff, with him slipping into 'Mr. Fixit' mode when you just need to vent and his frustration building b/c he can't 'fix' your work sitch or past bad day. IMHO, this would help him to see how he can better support you.
