Re: water/rust stains
Clay bar and Detail spray is a very good start. I wouldnt use CLR or any related products on automotive paint under ANY circumstances-much too caustic.
If the clay bar doesn't do the job, a cleaner wax or paint polish should be the next step.
CLR is recommended only to remove rust from house paint.