I did a thorough detail on my Z06 that I picked up back in March (thread here: http://www.autopia.org/forum/showthread.php?t=127748 ).
I addressed the water spot etching with my PC, orange CCS pad, Menzerna PO85RD 3.02, and patience. At the time, this combination took care of most marring...