I concur with the vet.
He is probably drinking too much too fast.
Something similar used to happen to Ellie.
She would choke after drinking but it rarely happens now.
Of course she rarely drinks now because her food is full of moisture.
If you want him to drink closer, I'd keep trying the water bottle.