Try using Meguiar's ScratchX on a problem area first. Some claim it is the same stuff as their Diamond Cut product. It can be purchased at most auto supply stores for about $7.00 for a 7 oz. tube.

My experience with ScratchX has been amazing. I have used it on our 1995 E420 on scuffs like you describe and it was the only product that could clean them up. Oher polishes and swirl mark removers were not aggressive enough to do the job.