Fireworks, I'm so sorry to hear that your symptoms have returned. I know the feeling of thinking your totally done with GERD, but then it comes right back and smacks you in the face. The only thing that gets me through it is realizing how many people have worse problems than I do.
I hate to tell you this, but you may have to have a strict diet regime. I know it doesn't sound fun, but the important part is for you to feel completely better. Obviously your problems seem diet related, so it looks like you've got a decent grasp on your situation.
Good luck, and get better soon. Sometimes life can be hard, but it is only as hard as you make it.
The advice I provide and present to you is solely based on research and doctor diagnosis. I am personally not a doctor. Going to a doctor is far better than listening to what I have to say.
I have experienced a lot over the course of years, and I am glad to give you some pointers to help you overcome your struggles.