I would try adding a little more water while lathering.

Pre shave oil may just cause a little more problems. It seems to me to make the lather not soften the whiskers as much imo.