yea get the mcguires... it brilliant.. i use the gold class paste wax for my white s2 and it luks brilliant when its clean.
theres this other stuff called zaino its one of the best products ever but its quite expensive and u have 2 get it from the states.. http://www.zainostore.com/Merchant2/merchant.mvc thats the website..