In the end we both realized we have stuff we need to work on in the relationship, things that need to change, etc, and decided not to break up. Since our talk we haven't fought once and things have gotten way better.
Today we got together with my parents and my brother for lunch, as kind of an early Christmas celebration, since my parents are leaving next weekend to go to Florida for the winter. We had an awesome buffet lunch at The Mandarin. They gave us a Christmas card with a $50 Walmart giftcard and a food dehydrator!
Now we can make beef jerky!