YJ doors will fit on a TJ. I know because I have them on mine. You have to do a few minor mods but it isn't difficult. You'll have to modify your door strikers , put a straight striker on, as opposed to the U shaped one on the TJ. The inside door levers will have to be shortened a little bit so you can open the door.
I found a wrecked YJ in a boneyard and got the strikers from that. I cut the threaded part off and had them welded to a small plate. Bolted the plate to the existing holes in the tub and good to go.