Nice job Mike.
I have tried all the Zymol waxes and they are very over-rated. P21S is one of my favorite carnaubas. You should also try Pinnacle Souveran (or perhaps the less expensive Signature II) which I feel is better in many ways.
For wheels I like the OTC Eagle One A2Z wheel cleaner, even better than the boutique products with the exception of P21S Gel cleaner.