There is seriously way to much messing around for that swap for the small improvement it would be, unless you went for the KL-ZE but good luck with that, azz knows all about it, not worth the trouble.
I'd be doing ZE swap and then one day I will find out how to wire in the ZE ECU and that will be your best gain and then you can stick with ll the direct bolt on parts for the BJ car and motor, so no messing around with everything and no need for engineering.
Rupe is your man to get the motor through. But when your ready just hit me up I'll try and help you organise as much stuff as possible