Yeah EFI should help a bunch with fuel economy, an older link should be sweet or even a microsquirt/megasquirt ECU since it will only have to run the fuel injection side of things
You able to give any more details on the triumph hoarder guy? Would be keen to go check out his collection if theres that many lying round the place