Bringing this thread back...any luck with the water spot removal OP? I just purchased a 2018 4Runner and there are water spots throughout the entire vehicle on both the paint and windows!! The paint I will have to live with as I don't want to risk damaging the paint/clear coat but to be driving around with "dirty/spotted windows" is just so annoying.

i gave up to be honest.

the hard water spots on your paint should be easy to remove with a good wax and polish.

I used white vinegar & water before, 50/50 mix to remove water spots from glass. Mix it up into one of those spray/mist containers. Apply to glass then wipe. It also works on body panels too but removes any wax so be sure to reapply.