That is a lot of suggestions, I second the idea of changing marker lights color.
I do have some good news for you, you can already take water out of base tanks. Below is a part of the tech window, you are looking for the water spigot, marked in red.
Connect it to the base in any way and just click. This way you can even turn ice into water bottles without crafting them one by one. Put ice into tanks and take out bottles.