I see a handful of Golf TDIs that are of interest to me. A few have the xenons and manual gearbox too.
At the end of the day, I'd love the fuel savings (both consumption and per-litre cost) and "new car" and manual gearbox, but there's so many things I like about my 325i (and no car payment), I can't see myself letting go of the 3er.