Definately leave the original loom in. Just take the engine management loom from a S2. It needs to be separated from the main loom.
Personally of course I would never even bother with the MFI and just make a new additional loom for some programmable EFI system.