[stick\shift]

Assuming the berm is staying, I would put in some kind of artificial creek to drain the water away instead of letting it soak into the ground. Like a pond liner with rock mulch on top of it.