Dude, maybe use Hall tech, Jim Dinner used original computers and relays on his V12 beema, it worked and drove pretty good to me, but it had some problems after, so he change the to Hall . got it Dyno tune by PURE , ( they specilize in tuning German and Japanese cars.) Kick butt now.
in long run you may save more money rather swap ECMs after other . see What Nick Truman went with his Audi engines.
let us know about the progress