I agree, wait for Candyman.
In the meantime, have you heard of Griot's Garage? They make all kinds of specialty products for the truly obsessed car owner (I guess that's me). I keep a number of their products in the garage and one is a glass polish that helps take scratches and imperfections off of glass. It does work pretty good and I use it on all the cars and around the home.
Other auto stores might carry something similar.
Car Care, Detail Supplies, Garage Organization, Car Accessories - Griot's Garage 800-345-5789