One thing you could try is to switch to cold water shaving. Some peoples skin(mine included) reacts better to shaving cold instead of warm.