Thebigspendur is right. You're on good track.
For a few additional thoughts, that might ring a bell for your situation:

Better pre-shave preparation can make a big difference. Soap and a brush...