Here is what I am going to do..
I bought a bottle Z-PC Fusion Dual Action Paint Cleaner Swirl Remover and Z-2 Polish.
Any decent non-abrasive wax will fill in the swirl marks and make them disappear. The problem is that after a few car washes the swirl marks re-appear as the wax is slowly degraded and removed.
My goal is to permanently remove them. According to Zaino, the Z-PC is abrasive and will remove the swirl marks.
I'll let you know how it goes. The goal is to have a clear, swirl mark free shine without any wax! Once I achieve that, the wax will lock in and protect the finish.