Stress or anger related heartburn?!

I had never really had a significant amount of heartburn until I became pregnant. After nine months of awful heartburn, I learned I had been dealing with an out of whack gallbladder and had it removed with promises that my heartburn would go away. Well it hasn't. It has been a year and half since my son was born and I get heartburn no matter what I eat. I can drink a glass of water and have immediate heartburn. I've tried Prilosec and for the most part that works for me, but here's the weird thing. Whenever I get angry or worked up or stressed out, heartburn hits me IMMEDIATELY. If I get a stressful email from my boss? Insane heartburn. Argument with my husband? Heartburn. My son throws a fit in public? Heartburn. It seems like that's my body's way of coping with stress (my body has been known to deal with stress in weird ways-- I had several stress-induced seizures while in high school). Any suggestions? I've been trying to not let things get to me or bug me (Woo-sa!), but life happens and we all tend to get upset and stressed over something or another. Has anyone else experienced this before? Any non-medication type solutions?