Good luck with keeping the Black car clean Walrus
It's a full time job in itself.
Clay should be able to remove hard water spots.
Consider Opti Coat 2.0 or Cquartz finest after the paint's restored to perfection -> makes upkeep easier in the future..