Sorry to hear about your troubles. I second the LS swap, I love mine and have a hard time thinking of any other powertrain. They just work.
I agree with Eric on finding a temporary DD and then take your time doing the Scrambler right.
Second choice would be a quick and dirty swap of that running 258. But- with the past history you've had- if you go the quick and dirty route, start building a bulletproof powertrain in your garage once the swap is done. That way you can take your time, do it incrementally, and install it over a weekend or two when the time is right. Even a LS swap can be done fairly quick if all the parts are pre-assembled and ready to go.
Third option would be a combination of one and two. Get a temp DD with a good 4.0 powertrain, get the running 258 and do the quick and dirty swap, then harvest the 4.0 setup out of the daily driver, part the rest out, and do a weekend or two swap and have a great running updated Scrambler!