just use
ScratchX to remove swirl marks and use after it
nxt wax
after removing all swirl marks (maybe after next moth) if you like you can use wax cleaner as first coat then follow by nxt wax
wax cleaner is like refresh the paint to waxing and keep ScratchX for heavy work