You might want to consider not using wax and use a product called Zaino.
It does not contain wax. It is a polymer sealant. I started using it four or five years ago when I had a solid red car and was trying to find something that got rid of the swirl marks. It worked and I have used it on my cars and motorcycles ever since.
In my experience with this product, it lasts much longer than any wax I have ever used. It is very easy to use also.
The Zaino line includes a polish, a one step product (polish and protect), two different final coat products, detail sprays, etc.