Picked up some Meguiars's Ultimate Paste Wax and Quik Wax. They were awfully expensive, but two detailers I know swear by the stuff.
I made a mistake a few days ago and let my son wash the car. He didn't dry it off and it ended up with water spots. I had to wash off the spots.
Now, if it would stop raining, I would go out and wax her up.