The tool maker should be able to make a canteen. Nothing builds up a thirst like running around for hours looking for one animal. You could pop open that canteen and get a drink without having to back track to water.
Even better. After filling it and having it in your pack.... Why the need to even select the "drink"option. Wouldn't it be best to stop the micro management. So canteen and food should have trigger points each player can set.
Eg when you sit to rest and you have a canteen filled and 50% or less thirst bar = auto drink
yeah, the ability to carry water is probably already on a very long to-do list. I agree drinking could be less click intensive, but in general, I believe this game should not get too automated, more intuitive yes, but not automatic.