Upgrade the 258 on the cheap
There are lots of alternatives to do, but the question is what you want to pay and how much of it can you do yourself.
If I had the time and space, my jeep would have a 4.0L in it. Pure and simple, but because I work and travel a lot and only have a 1 car garage now, I have opted for a continual upgrade approach.
In 2000, I upgraded to the 4.0L head right after I had my thanksgiving turkey. Junkyard head, bolts, and complete valve job, along with the the peanut-stuff/marine-tex gray method cost $250 or thereabouts.
While I was at it, I swapped the borla header on ($200) and a weber carb ($200). It was a tremendous improvement. I added an MSD ignition (120) and ford TFI upgrade ($60)
I then sold the weber for $190, purchased a clifford squarebore manifold used ($50) and a holley 390 4bbl ($200) and it made even more power.
Today, I am finalizing the purchase of a howell tbi system. The total cost to my door is $1150 with carb certification and a special chip for all my mods.
What did I learn? Well, total input to the engine is somewhere to the tune of $1700 after I sell off my holley 390. I am expecting it to make more power than just the bolt on EFI with same reliabliity. My engine has never skipped a beat in 5 years and 50k miles with these mods. I think the howell will only add to my pleasure of having the jeep.