i did find i used to go through engines abit in my vitara,
deep water hot engine :-(0
i did put in the SPI engine in my 8v i managed to get sent the loom but i shortly bined it and put my carb manifold back and installed a eletric pump
all seemed to run ok, i picked up another 8v so that went in and eletric pump removed. i foudn that engine was teh best out the lot.
swift engine has a lot more power but your need to mod the dizzy, i think rhino ray does the bracket.
to be honest i was going down the line of a pug or a vauxhall 2.0 but i decided to throw the towel in after many years in the vitara when the chassis was so bent and twisted and the engine mounts had parted company i called it a day .
but yeah TDI power has to be the way forward, just watch out for cooling.