Another thing to consider, if you swap the engine and emissions control stuff from a newer vehicle (I recommend 91 YJ) it will pass smog better as a swap instead of a custom EFI job.

I would go for the motor swap. You get the EFI without the hassle of pulling the motor apart modifying and reassembling.