This is great. Another wonderful piece of advice I had read somewhere for similar situations is:

"remember that an argument between you and your partner is you two against the issue rather than against one another"

I think it is a great way to refocus the conversation and work toward a solution.