For those who think combat should involve more combat and less drinking,an idea: Stamina could include both 'hard' and 'soft' stamina, much like how HP includes both HHP and SHP damage, with a small amount of the former being accumulated at the same time as the latter. This would represent long-term stress or fatigue that goes away at a slower rate or is more difficult to remove. Since it's only combat where the stamina recovery process is off-putting, 'hard stamina loss' wouldn't accumulate during routine work, but it would increase faster than it could regenerate while sprinting, fighting, or during other non-routine exertions.
With this change, there'd be the opportunity to re-balance sprinting so it could be done for longer than a few seconds without drinking as well, since that's currently limited only by how quickly it drains stamina relative to the alternatives. So those who aren't worried about 'hard stamina' fatigue impairing their performance could be more comfortable using it just to save time.
The only PvP experiences I've had were years ago, and none of them involved actually fighting fair, so I haven't personally experienced this chug-a-lug meta. I am familiar with a similar phenomenon from Ultima Online where the winner of the duel might not be the better fighter but the one who's better at running in circles while bandaging themselves - and where most of the time in duel is spent doing the latter instead of the former - so I think I understand how doing the same thing with water instead might be derided and seen as awkward to balance around.