Hi and welcome. I would ditch the oil pre shave. Personally I use soap to wash before the shave to get rid of oil, lather and rub it in and leave while stropping snd then rinse, relather and shave. Replace skin oils when you finish with your moisturizer. Cold water shaving might also help.