Hi, David. I've just got an idea.
Can you add an item that can block tunnel? Something like stone block or clay block.
So when you accidentally dig the sand and the water leaking, you can place that block to stop the water.
This also usefull when crawling the Wyrm labyrinth, as we can put that block on wrong path and only walk on unblocked path.