I actually like your approach to handling arguments in situations where they are inevitable. It's important to be careful of words and most importantly I don't try to prove anything, my goal is to educate and not to impose my ideas on you.
Walking away when the heat is much and coming back isn't a bad idea, what matters is passing the message constructively.