Buy now or wait...
Between the V6 and 2.0T, if you don't mind mildly modding your cars, you could install an APR or GIAC chip into the 2.0T which will bump up the performance to essentially match the 3.2 V6. If you're comfortable with a chip (which is VERY reliable), than this is the route you should go.
In the end, you should make sure to get all the features you want and the exact color combo you want. If you don't get something you want, you'll likely regret it after a few months.
http://www.dansdata.com/hotchips.htm







