I noticed one problem with the package listed above. You stated that the swirls are bothering you. Swirls are caused by very fine scratches in the surface of the paint. For swirls to be removed you need to use a product with an abrasive in it. This will smooth and level the surface and create a ready to wax finish. Menzerna FMJ followed by P21S wax is an excellent choice. I would just switch the Klasse AIO with a product like Menzerna Final Polish. If you have any other questions fell free to ask.
Brett @ OCD