I would look for a 4.0L YJ and pull everything from it. Gas tank, engine, radiator, tachometer, harness, PCM, transfer case, frame mounts... An XJ Donor won't give you the gas tank, tach and frame mounts. Although, you might just find it easier to get a 4.0L YJ and swap your parts onto it. That would be a lot less headaches.
I'd stay away from a '87-'90 XJ Renix 4.0L.