the 1.9TD will take a little thinking and planning, the fuel pump is the issue, if you can get the AAZ engine it will pretty much bolt in BUT you need bits off the 1.6TD
The 1.9D you don't have any turbo issues to deal with and might be a short term solution and there should be plenty out there, i know when i have my T25 i looked into it and i could have bought a few 1.9D's for 100-150 euros
George