Recalculating Water Physics

Is there any way to recalculate the water table?
I did some digging to put a moat around my town and enlarge the natural lake, but it ended up as a series of glitchy staircases made of water blocks, tons of clipping and bugs.

water isnt finished yet… water is far from its finished state and was only thrown in for looks for now… eventually it will be important and have more work done on it (like using it for farming/irrigation or drinking ect) but for right now its just buggy and glitchy…

Cant wait until they do add all those other features like seasons and irrigation ect.