There is also the 150bhp gttdi which is also chipable to a very respectable bhp rating. It would no doubt give the 1.8T a run for its money if not beat it, off the mark. Might be worth going for that model if you really want a diesel.
TDI's come in 90, 100, 110, 115, 130 and 150
the 115, 130 and 150 all have 6 speed boxes.

all depends on your budget really.
about 8K will get you a tidy 130bhp
