Have a look on the t595.net forum. There is a lot of info on engine swaps and some experts contribute to the discussions. One thing I will say is beware of very early T595 engines due to the weak 4th gear problem. Many have broken up, mine included and it cost me £650 to fix. Ouch!