Thanks for all your replies.
Here's an update:
First of all, to all of you saying I should not use steel wool; like I said in my first post "I tried using steel wool on my other car and scratched the glass, so
I'm not using steel wool on the Z"
I tried using the only clay I could get my hands on (which I assume it's "normal" not aggressive) and that didn't do anything
I've been looking for the products you've mentioned but having trouble finding anything locally. I'm going to the US in a couple of weeks so I'm going to get some of that Autoglym's stuff and try it out. I got some 3m rubbing compound and rain x to try out today, see if that helps with beading the water.
I'm also thinking about buying a DI filter to rinse the car with, but in the meantime I'm dealing with the problem by using a squeegee to dry the windows as fast as possible. It doesn't matter how fast I try to dry the car with a cloth I always seem to get water spots in the last window I dry. Its daemon water I'm dealing with here
Just FYI, this is what I'm dealing with on all my windows: