I have oily skin and Mitchell's Wool Fat works for me. I follow with Dominica Bay Rum, which is mostly alcohol. I still get the occasional outbreak, but not as bad as before switching to a straight.

Instead of pre-shave oil, try lathering and apply a hot towel, then lather again.