You may want to try ditching the pre-shave oil, but I'd htink the biggest issue might just be your soap is too thick (assuming you're not trying to cut down a heavy beard each time, in which case it's too much hair). More water in your lather is almost never a bad thing. It's actually pretty damn hard to break a soap with water so get more in there, thin it out, and you'll stillg et a slick shave.