I've found that it requires self-discipline on both parties making an effort to break the pattern-matching/automatic-thinking to emotional pipeline that is so easy to fall into.

Kudos to both of you for having that.