a claybar and wax will not remove swirl marks, the wax may have fillers to hide the swirls but it will reappear.
You want to do this properly and thats using a polish/compound depending on severity of the swirls and a random orbital machine with appropriate pads.