2.5l to 4.0 swap

I have a 97' Tj with a 2.5l that is now shot (broke the #1 piston and put a 1/8" deep gouge in the block, picture attached), and I'm looking to replace the engine, but would like to up to a 6cyl or 8 cylinder, but want the least amount of problems and least amount of Fabrication. Please help...