Inconvenience of drinking potions underwater

1. What I would change?
I want drinkable potions to not be instantly refilled with water while being underwater.

2. Why i would change it?
It's minor inconvenience (but still..) in underwater exploration, especially inside ocean monument. For example when I carry multiple potions I want to keep empty bottles for future resupply but due to the tiny time window of auto refill, most of the time I fill them with water unintentionally which is problematic because unlike empty bottles, filled ones are not stackable. It causes me usually to drop them in favor of more valuable loot.

3. How I would fix it?
Instead of just holding mouse button i want it to be refilled by clicking it. Additionally, a short time window could be implemented after the initial mouse click after which it would work the same as it does now. So that it won't break any existing redstone contraptions.