Im having the same issue every 2.5l YJ owner has. Ive found a company near me that will assist in a motor swap and was considering the straight 6. any thoughts. If im swapping should I just go all out ( go big or go home ) or would a 6 cylinder swap be worth the cost and time?