stick with the 1600 you just built, and run efi of your choice job done, less hastle alot cheaper, as you only need to fit ecu and loom. as you already have a fresh engine