Buy some distilled (or de-ionized) water at the supermarket. Make your lather with that, and see if things improve.

If they don't, it's time to work on the edges.

charles