May I suggest the possibility of take the car into a dyno shop and either you or the shop doing the tune on a laptop? I'd do that before canning the EFI system.