Try adding a little gelatin to the water. sometime water just goes down too quickly which causes them to choke. If you add the gelatin, it will thicken up the water a bit, and slow down the flow of water down the throat.

My dog too suffers...