I think that the best way to go is to drink when thirsty. That works for me because I am always thirsty.

When I lived in Mexico, I was pretty much never without some drink or another. The problem was that too often, that drink was Mezcal.. Which isn't known for its thirst quenching properties.