My drinky bird keeps stalling with his head stuck down in the water. I've adjusted his pivot point a few times this morning, and I think I may finally have it. I finally raised the water glass and moved it so that it acts as a stop to keep his head from dipping too low when he drinks. So far so good.
On the plus side, it causes him to make a satisfying "thunk" sound every time he dips for a drink.