Jeep Strokers

Here's my story. Got a 2000 TJ with 95000 miles on it. Knocks at idle so I "assume" it is piston slap so Its time to rebuild. I want to build the stroker short block first while still driving the rig, then pull the engine, rebuild and install the head, and drop it back in...all this before EJS in April! I have the crank, rods, pistons etc, but I have a couple options for the block. Remember this is a 2000 TJ. I can get an 89 XJ block for free or a 94-95 XJ block for a hundred bucks. What should I do?

From what I've read and have been told, you have to stay with a 2000+ block if you want it all to go back together easily. The bosses and mounts are in different places than on earlier motors.