Hi. I've been in a same situation few months ago when I switched from my 8L to a B7.
I went for a 2.0 T FSI Quattro in the end instead of the 1.8T.
I got a (BGB engine) and so far its perfect,no issues no thirst for oil...
My Mpg stats through the few months of ownership goes in the range from 25-to 37 with average holding around 30.
hope this helps a bit.