I personally put the Chevy 350 under my 89 YJ. It runs, and sounds good...........
I also put fuel injection on it, so that it would not stall out, on the climbs. If you have to replace the motor, it is the only way to go. Give Novak, a call, and they will help you with whatever you decide on. Great people.