In the future try spraying down the whole thing with ONR at QD dilution after rinsing it. I have extremely hard water and although there were water spots afterwards, they easily came right off when I was applying a spray wax with a microfiber towel. I have never had a car this water spot free...