I had similiar symptoms only to find out that my hiatal hernia was allowing my stomach to protrude into my esophagus. I had other symptom that worried the heck out of me and they were all related to GERD and my hernia. I had the fundo and HH repair 15 days ago and most of my symptoms have subsided. There are some dietary changes you could make that may relieve the inflammation and discomfort until your operation.
1. Eat 6-8 small meals a day
2. Avoid caffine, nicotine, and alcohol. Also anything carbonated.
3. Avoid spicy food and acidic fruit (i.e. oranges and orange juice).
I have zero medical qualifications but I found these suggestions helpful to me before surgery.