I used to get a lot of heartburn and indigestion. I started drinking 2 tablespoons of apple cider vinegar a day. This sounds illogical, but the vinegar is very close to stomach acid and the problem is usually not enough acid.
I keep my vinegar in the refrigerator and drink it after lunch. I drink it like a shot and chase it with cold water. This just leaves a slight apple taste in your mouth and a slight burning sensation down your throat that quickly goes away. Give this a try for 2 weeks, and I think that there is a good chance this will alleviate your problems.