I'm not saying the above to excuse his behavior but just to look for concrete solutions to repeat pet peeves since he can't seem to handle his pet peeves right now. I think overall this interaction was positive. You showed him a new behavior you're going to do when a conflict happens. He showed you a corrected behavior. Both of you chose not to escalate it, though no one enjoyed it. It's not perfect. But a baby step it does seem like. Congratulations.
