Congrates....may I suggest Zanio Z2 for you wax. Its really a polymer and works very very well. Have been using it for years and it keeps the paint looking like new. Seems to hide surface scratches in the clear coat too.
You only need a small dap for each panel (size of an eraser head) and it comes off really easy.
(You just need the Z2 and not the ZFX or ZAI0 they talk about on the web site)
http://www.zainostore.com/mm5/mercha...de=polishshine