Ok well I wrote a whole long thing, but writing it out helped. I realized that I value my friend's friendship and I will wait on this. Maybe I will contact him and just be honest. His approach to conflict stresses me out and I'd like him to be more mindful of his approach when he is upset with me.