You outlined the problem, and here are a few solutions:
1) Don't make your lather too watery. Just enough to stay moist throughout the pass.
2) If it's a hollow grind in the 5/8-6/8 range, rinse it...