Water blocks should be able to be drank from by holding the sneak key (Shift) and the right mouse button while aiming at a water block.

They will always give the thirst effect, and have the same amount of saturation as dirty water bottles.

Check out the Slurp mod which adds this feature.