I recently went from a Fuji 2010 SST1.0 with Mavic Ksyrium SL wheels to stock Trek Madone 6.2. The Trek is very heavy compared to the Fuji but offers much more comfort and customization. I still have 3 weeks to return the Trek. The 2012 models are coming out soon. Would you wait for 2012 or stick with a 2011 model of the Trek?