Go for a tdci if budget allows. fuel pumps on the tdi's are shot honestly!

If i had a quid for every pump i've changed on one of them.... well... id have a fair few quid anyway!