Congrats, I think you've made a wise decision!

I'll be very much in the same position as you at the start of next year. I like the space of the Golf, and the drive and tourability of a TDI, but both together are a bit more than I'd like to pay. So I'll probably get a 2010 Polo TDI.