Vinegar will sometimes help also, or Chemical guys make a water spot remover. If that and or the clay bar doesntbdo it, then it has etched the clear coat and fixing that will require some machine polishing to remove.

I also like the zaino products, but after having water spot issues, have been topping with a good carnuba wax which seems to help offer more protection from hard water.