get someone to use compound and remove all the swirl marks - go to a good detail shop with a good rep. Ask your dealer - they may use someone to do this type of stuff rather then their own crew...