Your prep sounds great, my only suggestion would be using Proraso preshave. It isn't very oily but gets the job done nicely.