Maybe try a stronger scented shave soap. Mama Bear's has a whole line of menthol soaps, one even called "awakenings".

I love to shave in the AM. It's my morning coffee.