Your prep sounds quite similar to mine. I might have some nuances to yours, but you may do this and just didn't mention it.

I usually shave pretty close after a shower, but when I don't I soak...