No doubt, future drive trains will involve diesel, hybrid, and pure electric options. But it won't come overnight.
I'd say that if you want a 3.6, and don't have an acute need to buy a new car right now, then wait for a 2.0t. But if you are leaning towards the 2.5, then it may be a while before there is another alternative.
I'd say that if you want a 3.6, and don't have an acute need to buy a new car right now, then wait for a 2.0t. But if you are leaning towards the 2.5, then it may be a while before there is another alternative.