Ginger tea yes - anything with lemon for my is a "no no" because the acid - even in the tea can make it much worse.
Start eating plain, nonfat yogurt (it helps to get your digestive track back where is should be). Make sure you're getting enough water. To the extent possible eliminate any foods that are spicy, fatty, greasy or acidic. Sugar should be the first thing to go. Limit your caffeine intake. No soda. A big help is easting some crystalized ginger - ginger is great at calming down indigestion.
Over the counter meds like tums or gas-ex can help greatly.
If you do your part, its probably going to take 10-14 days for it to start to calm down - there is no instant solution. If you are doing your part and after 2 weeks you don't feel better then call your doc.
Best of luck