So here's an idea, completely remove infinite water and you have pipes that can transport water in tanks and out tanks. and if you connect a pipe to a new dispensing block (or maybe just a regular dispenser) it dispenses that water and pumps collect water. Now the thing is, water would have to be completely reworked, requiring water to have to have some sort of gravity. When you finally have access to water from the ocean you can use this as normal but because of the gravity change you could fill lava caves with water and drain the water to have a sort of cave extinguisher? But this could have effect on redstone like, you could run a comparator from a tank and the more water in a tank the stronger the redstone current. This idea may suck but hey, it's worth a try.