engine swap/upgrade

[Zorm]

Got a 87 4.2 with a modified HO 4.0 head with the stock 258 intake with a 2100 2bbl and HEI dizzy. I have a 92 4.0 wating to swap in, along with a 2000 4.0 intake and fuel injectors. So my question is, should I just swap in the 4.0 with the newer intake, or keep the bottom end 258 with the HO 4.0 head and just swap in the newer intake and injectors?

this is in a 83 Cherokee and mated to a T176 and NP 208. So since I will be going from carb to fuel injection either way, I am in the process of thining out the 92 wire harness of the stuff I do not need, I will be mounting the ecm under the hood and, depending on which way would be better, can swap in the stock 4.0 dizzy or keep the HEI dizzy.

any thoughts and helpful hints welcome

[Zorm]

btt