i would definitely suggest for a turbo but mind you it will be near 40 now, i was also in the same situation i bought a 1.8 and regret it, but the price for a low mileage 1.8 is also high, i have a 17 recently got a offer of 39 which i passed.
The rate you are mentioning was last years, or the vehicle would be driven 80+ or 1 2 pc touchup.
also for turbo all issues were sorted out by software update.
fuel avg i get for 1.8 is around 9, but i have 18" alloys and wider tires so i guess, turbo has better avg.