I would try raised feed/water bowls. Dancer was a huge drinker/belcher puker when we first brought her home. I asked my Vet about it and he suggested the raised water bowl and Tums. We raised the bowls and it cut considerably into her belching/puking issues.
I also do not let my dogs tank up on water. They can drink all they want, just not all at once. If I hear them lapping loudly for more than 30 seconds, I make them walk away and wait a minute or so before they can start drinking again.
JD, our oldest 'Tzu, is on meds. for blood pressure and CHF. He does not have issues with puking up food or water. In fact, he thinks cat puke is warm chow. Yeah, he sleeps on Kevin's side of the bed too. :lol