Ive had really bad heartburn recently too. The only thing that temporarily works is mouthwash for me lol. Gaviscon doesn't really cut it anymore for me.
Hope it gets a bit better soon.
Oooh also Ive switched to decaf tea and coffee which seems to have eased it through the day
xxx