I have the same pain, right at the end of the esophagus. I also have an occasional hiccup and burping. I am trying to take small sips, exhale, and then swallow, it seems to help. Hard getting all the fluid down taking small sips.
My surgery is tomorrow at 11. I am very nervous also, but ready to be done with the liquids also! Good luck to you!! We are on our way to a new healthy lifestyle!