Thanks, really glad you're enjoying it!
I assume with (1) you mean that you want to be able to refill small bottles, regular bottles and water pouches, rather than only getting one type from each source? If so, then while I agree it would make logical sense, it would also completely destroy the balance of the game. I'd likely have to heavily reduce how much water you get in general to compensate, so it'd be a lot of work to end up in basically the same place.
(2) Is already done. You can double click an item in your inventory to consume it immediately (if it's not on cooldown)