Dans Detailing
Dan's Detailing
I would try a different soap. If you are getting water spots on the car, you should be able to try different soaps to use . I would look for a soap containing a small amount of wax in them, they tend not to spot as easy. One soap that works great for that is made by northern chemicals. It's their wash and wax soap. It's very sudsy and even with hard water it rinses clean and will not leave spots on the windows even on hot sun baked cars.