It's probably too late for this but I found a product a few days ago called
A-1 Hard Water Spot Stain Remover and I tested it on my old, dull and dirty '87 blazer... this thing is awesome! it not only took off the old waterspots with ease, it also got rid of the oxidation and built up dirt decades old! The kind of nasty stuff you have to go over 5 times with other stuff. The finish was not a high glossy one but i could see a nice refection of my face. I'm sure after a coat of wax, it'll look like a new paint job.
I kinda gave up on cleaning my blazer because it was too tiring to deoxidize, but now I'm on a mission to revive it to it's original splendor! Well, as much as possible given the current condition it's in...a little rust here and there. Oh, it also claims to do a lot of other surfaces which is a plus and it's "nontoxic, water based and biodegradable." I still have to test it some more. But I can't wait to try it on the KJ since I also was too late in washing and waxing my KJ. I have tiny waterspots all over the glass, hood, roof and fenders.
check it out. I got for $10 at a local store but I see it's like $15 online.
http://www.envirosafe2000.com/water-spot-stain-remover.html[/url]