[@Shorticus]

I am leading more towards building a wall to help keep the water at bay as well, but that runs into the same problem with the whole manpower thing. A ditch to just divert the water may just be the best bet in the end.