Get a clay bar kit. Completely strip the old polish/wax and start over. The clay will remove any surface impurities including water spots. Follow this procedure:

wash with dish soap (Dawn)
clay bar the complete car
wash again but with a high quality car wash soap
dry with an absorber or high quality 100% cotton towels (made in us)
apply any surface prep/cleaner wax/etc.
apply any polish/wax specifically for swirl marks (if you have any)
apply a final coat of high quality polish/wax

It's a lot of work, but it will be well worth it.