Glass Cleaning Kit

Looking to purchase a glasss cleaning kit for my MS3 as I have gotten some pretty good waterspots on the windows. Trying to decide between the Diamondite Glass Cleaning kit and the DP High Performance Glass Restorer. Anyone used either of these products? Thanks for any advice.

Um what about some stoners and a cloth of some sort?  Newspaper's supposed to be great for not streaking.   

I saw my buddy use newspaper they other day.  I will no longer use paper towels.  The newspaper is a nice trick!

Only thing I use on the car is microfiber. Works great. One microfiber towel can soak up all of the water left after a wash. Also have some specifically for the windows and the interior. If you havn't used them before give it a shot.