You must address the water flow issues and it has to be a permanent solution; a french drain or diversion can work but do not underestimate the work involved, likely to require more than a shovel and lots of sweat!
You say the other locations are not ideal; in what ways, water flow as well? If...