I'd go with the Audi to be honest - lots of parts interchangeable between any VAG using the 1.8T and very DIY if that's your thing - pick up a VAG-COM cable and a laptop running XP and you can self tune, run diagnostics and customize the pretty much anything electrically driven or controlled via a nice simple interface
If you #### something up, no worries - a few clicks on the mouse and it can be put back to the default level and you can try again. This works on all VAG vehicles from the early 90's onwards, so thats Audi, VW, Skoda, Seat and if you can find where they've hidden the input ports, a Veyron, the two ugly Lambos and newish Bentleys
Realistically, VW/Audis from the 1.8T onwards are getting "Toyota-ish" in terms of reliability and a good solid, safe cars. Not too thirsty either
