Should I wait for a 2008 B8 6mt or capililize on a great deal on a 2007 S4 convertible.

I'm not an enviro-nut, but only getting 230-ish miles on a tank would drive me nuts... I don't know if you've sat in an a5 yet either, but the interior of what's going to be the b8 is awesome. Not to mention the handling should waste a b7 s4...