I would suggest either using a cream or a soap with more "cushion" although oil might help too.

Tabac would be my first choice for soap and Proraso for cream.

If you don't want to change your...