I am not a dermatologist and what I suggest might be completely wrong for you; therefore, take my thoughts with a grain of salt.

First, lay off oils for pre-shave. Also, get yourself a better soap...