I have never heard of the water and baking soda idea, but I'm glad to hear it helped you!
If you keep having problems, you might also want to try Gaviscon (feels absolutely wonderful on the esophagus when it goes down!) or Maalox (apparently Maalox helps with gas too). If these do nothing for persistent chest pain, see your doctor!