Good points though I think your pre shave could use some tweaking imho
Can you get in some more work? maybe a lather for a few mins hot towel for a few mins and relather between your shower and...