Sounds like it is time to start fresh.
Strip the wax/polish and clay bar to remove the water spots.
coat again with your favorite wax/polish.

I used to use Klasse but found Zaino works far better. I felt Klasse was like applying floor wax. (which I bet is not far from reality, it even smells like "mop n glo")