I don't think your irritating can be healed by better pre-shave preparation. You can have next issues:
1. Stropping, you haven't mentioned that you have strop and use that you using it.
2. Dry...