You could try using a clay bar. I "clay bar" my windows annually. Also, there's an "old wive's tale" about using Coka-Cola to remove water spots from windshields.

Good luck,
Randy...