Completely agree with first part of your suggestion....not sure about the 1KD...
We all know the pre 2009 1KDs come with the injector issues and a good post 2009 1KD is not just difficult to find but very expensive...and then you need a good electronics man to hook it up, which is very difficult to find in Pakistan...