If I'm not mistaken, all the 2.5 blocks and heads interchange. I'm not 100% on that, though. As far as TBI vs MPI, you'd have more power potential with the MPI engine, but comparing my brother's 2.5 XJ and my 2.5 MJ, I don't feel a big difference in power, and I usually get better mileage than he does on the highway.