So what I thought would be a nice is an option in advanced settings where you can set if the water/lava damages you or not.
Basically this:
Badspot should've made the whether or not map fluids kill as a toggle in "advanced" server settings, as well as a box to set the damage level.