Sassygirl you should post this on the Car Care and Detailing section or do a search on water spots. You can send Turbomangt a pm about your problem, (He is a professional detailer and suporting vendor). Here is one thread about your question which might help.
Hard water spots & trunk closing scratches