Depends on it's use. If mostly a daily driver, I would say XJ, if you do a combo of both on and off road, it is almost a toss up, if more off road, the YJ.
That being said, as you said, you know the history of the YJ. It has what your looking for. The '95 is "newest" YJ you will find. IMO, I would probably go with the YJ regardless. You get a known product for a good price, and as you said, a little extra cash for expenses (ie mods!).
Three 95 YJ's(Sold), One 98 XJ(Sold), 99 WJ (Sold), 11 KK (DD), 58 Willys Wagon (needs Restored)
But when a long train of abuses and usurpations, pursuing invariably the same object evinces a design to reduce them under absolute despotism, it is their right, it is their duty, to throw off such government, and to provide new guards for their future security.