Sketch showing proposed change from entry side...
after - new water side...