This. Spraying on CLR is just asking for trouble.

Get an inline water softener for future car washes. It'll take all the crap out that causes water spots. Vegas has terrible water and this thing is a godsend.

Beyond that, use a good paint cleaner and a buffer, or really work it into the paint by hand. Once you've cleaned the paint you'll need to reseal it, because the paint cleaner will strip the sealant off. I like Sonax products from Detailer's Domain.

I'm with you on Vegas having horrible water. However, Using Stay Fresh's shampoo that actually prevents water spots from foaming has allowed me to do normal car washes without an inline filter. However a filter is always recommended.

I really recommend the shampoo by Stay Fresh if you are prone to water spots while washing your car. I am able to leave water on the entire car before drying for a prolonged period of time and have never encountered any serious water spot issues.