MK 2 Escort 1.6 Kent to 2L Pinto Conversion. HELP

Hey guys, I bought a mk2 1.6 GL 2 door a few months ago as my first car. It had been sitting for around 7 years so we repaired the rust and resprayed it, unblocked the fuel lines and it fired straight up. It has only done 90,000 original kms and is very original throughout the car. I was chatting to a mechanic I know telling him how I like my car but wish it had more power. He said the best power gain for the money would be a swap to a 2L pinto. Is this correct? Is it worth tuning the Kent or should I just upgrade to the Pinto and eventually tune that?
 
So onto the conversion. What is every part I will need? I know of a few 2L pintos around with all bolt ons and manual gearboxes with them. From what I know, I need a 2L pinto with all bolt ons, a 4 speed gearbox with the bellhousing to suit the pinto, cut the radiator mount (somehow?) to fit a 2L radiator. Not sure about cables and all of that though. Will the speedo cable be the same? Will the clutch cable need to be changed?
 
Also, would I be better off buying a wrecked 2L escort or just buy the engine and the parts separately.