Basically everything comes down to mis-communication. What one person might perceive as a "joke" another might take it seriously. I think when we are in a long-term R, that line tends to get blurred and we forget that.
If the two of you haven't been to MC yet, then that is where you need to bring up your past issues. Not together. I found out that you really need that third party to kind of sort through the egos and get to the real problems. What you might think is a "problem" might just be a symptom of a larger issue.
Of course you're not going to dwell on it, but you want to cut out the cancer rather than just tossing a band-aid on it.
Just my 2 cents.
M-43 W-40 2D - 9 and 5
Emotion, yet peace. Ignorance, yet knowledge. Passion, yet serenity. Chaos, yet harmony. Death, yet a new life.