Better Bottles (Details in post)

I would like to use empty bottles for  diving. Especially in the new waterlogged caves, you can't explore without using doors or other unimmersive methods other than potions,that are a hassle to manage (because they don't stack) or not even an option in peaceful.

Therefore my pitch: Using (right click) an empty bottle would give you 2 or 3 bubbles, but fill the bottle with water. Preparing a stack or two would pay off. Also water bottles should be stackable (in inventories, not in brewing stands).

I would also like to stop myself from burning without a cauldron or using up powder snow (in the nether).

Therefore my pitch: Using (right click) a water bottle, when on fire, should put the fire out and empty the bottle. (standing in a fire block with fire res may be a quick way to empty large numbers of water bottles)