I've used and can vouch for Gtechniq W9 Water Spot Remover, though it took a couple of applications for it to remove the hard water spots on mine. I've also been recommended CARPRO Spotless 2.0 Water Spot Remover. That said, I would have thought vinegar would have stripped it along with any paint protection..