I think What I am going to try before I rip it all out is to extend the vally on the top out a little bit and put a kick out flash at the bottom of the wall so the water doesnt curl around and under. I have plenty of water for my testing so I will see pretty fast if it works......

__________________

1982 300CD Turbo (Otis, "ups & downs") parts for sale
2003 TJ with Hemi (to go anywhere, quickly) sold
2001 Excursion Powerstroke (to go dependably)
1970 Mustang 428SCJ (to go fast)
1962 Corvette LS1 (to go in style)
2001 Schwinn Grape Krate 10spd (if all else fails)