Spotless. I just had a detail yesterday with the same water spots. Spotless cleared them right up. Or as every one else suggested you cant go wrong with Ceriglass. Both are amazing products.