What engine should I bring back?

any b series engine is good for FI. it depends on how much you want to boost it. 6psi is safe but if you want to go up to 20 psi, proper engine build up must be done. since you're going to japan, have the engine blueprinted and balanced. those techs in japan are very good in doing these things.