You could use the /fill command to clear the water, and at the same time use /setblock or /fill to make the outside a block to stop water coming in, then after make the blocks water and replace the air with water.
I can work on a model of it if you want, and send you the map of it as an example.