Keep in mind Wax will never remove any defects in the clear coat and or paint. You can rub it in for hours and it wont do anything. You need polish with an abrasive in it to get bad water stains out. I would suggest trying some Detail spray and see if this dwelling on the spots will remove them. I Say let the product (I use Adams Detail Spray) will remove after sitting for 2 minutes or so. Dont be stingy and use enough. If not go to a polish, you need to start out more abrasive and step down but by bit. If you dont have confidence to do so, find a good detailer.