Leah,
Try the Mr. Clean car wash system, even if you don't use the "wash" part of it, it has a filter built in that removes a lot of the minerals that cause spotting when rinseing.
Also, getting after it with an absorber or chamois works wonders.

Ldub