Spot on! I have been married for 14 years, done a stint at marriage counseling and what you have here is everything we learned. Our marriage is thriving because of all of these points. Especially staying focused on the issue and walking away if things are escalating with a plan to return.
I would add learning to listen more than you talk is also key.
All of these are hard to do but so worth it for a happy life.