Hey, unless you have the skill to do the job yourself it's the old time and money thing

There's no reason against doing either, the V5 would be a lot of money for not that big a gain, a 20vt swap would prob cost the same but you would have huge potential afterwards.
the tdi is an interesting idea

jv