Hi Zachary and welcome to SRP!

From what you have written your prep sounds fine. Shaving after a shower should soften up your whiskers to help the shave.

You haven't mentioned too much about...