stG58,
The other less talked about engine swap is using a Dodge engine. The good thing about this is there isn't any flim flam needed to make the computer talk to the dash. Now a lot depends on what year TJ you have. I have a 97 so my swap was real easy. I started with a 5.2L Magnum V-8 from a Dodge pickup or Dakota. You can also use the V-8 out of a Jeep Grand Cherokee if you want they are just a little different.
The Ram computer fits in the stock location and you just blend the Jeep & Dodge wiring harness together. The 5.2 I got was a low mileage engine but I could never get it to run right. So I ended up buying a 5.9L V-8 that was pulled by a shop and replaced with a crate engine. When I got the engine I had planned on just rebuilding it but a stroker engine fell into my lap so now I am building a 408ci. To handle all the extra power I had a RE46 auto tranny built. I had a SE model so I was going from a 4 cyl to the V-8 which was nice. If you plan things out you can have the swap done in under a week. There are some good write-ups over on the JeepForum about guys who have done the swap. If you would like more info just drop me a line and I'll try to help where I can.