I removed water spots on several Corvette's this Summer.
I clayed first followed by Paint Correcting Polish, orange Gen5 Pad. A couple passes with either the Flex or Rupes machine polishers and they were gone.
http://adamspolishes.com/shop/kits/4...hing-kits.html