Water spots (just did this on a black Acura TL yesterday) I generally try the least agressive approach and work my way up from there. I was able to remove some spotting due to parking near sprinkler heads by washing, then buffing with a blue Propel pad and using some VM. Took them out no problem, so I just wax and sealed that panel.
On glass, I have gone the spectrum of what I just described, to pulling out an orange pad with some light cutting polish, to vinegar/water.