I dunno, when me and my girlfriend have an arguement. I normally just sit her down and talk to her about it, and within 10 minutes we're back to being perfect_couple_01. Sometimes it's REAL hard for me to not lose my temper, but I've found if I can just sit her down and get her to be honest about what's wrong, we can normally work anything out. (vice versa on that as well) I don't really know the whole situation, so maybe you're past the point of just saying "Chill the fuck out and let's talk" Me and my girlfriend were friends before we dated for like 15 years, so I'm not really experienced on the whole conflict thing very much as all of our differences disappeared literally 10 years or so before we dated. *shrug*
I guess all I can say is good luck man, and I hope it works out for the best!