No question about it, go with the XJ. I have both a done up YJ and just finished building up my XJ, which are roughly the same build, same tires, ect. I switched to the XJ for many reasons and I dont think twice about the move:
roof/windshield that doesn't leak
you can sleep in the back...