Wax will help make the swirls less noticable, but they will always "come back" as your wax wears off. I had the same thing on my Nissan 300Zx when I bought it. I have been using meguire's polish everytime I wash it and before waxing. It is gradualy getting better and better.
Now if I could...