My OB has me on Prilosec and it does wonders most of the time, when that doesn't control it I use tums as well (but be careful, eating too many can cause constipation).
Try not laying down after eating or drinking, and elevating yourself to sleep if it is bad at night.
I've had heartburn/acid reflux as long as I can remember, and a trick I learned from a chemistry class in college is "buffering" - it sounds weird, but take a decent swig of mountain dew and it will buffer the acid in your stomach (brings down the pH)... tends to work most of the time! I usually do this if I don't have anything else available.
Also, I can't tolerate water right now, it makes me nauseus and increases my heartburn too - I've been drinking alot of lemonade and fruit juice. Things like milk, alot of caffiene, carbonation, acid based foods (tomato-y for me in particular), spicy foods, fried foods, etc. tend to aggravate it so it's best to stay away from them. (so much for my Mexican cravings!) Good luck!