All years will interchange, but not all are "the same." Some years offered optional heavy duty springs, which have a higher spring rate. Later years offered the Up Country option, with springs that are higher rate than stock and ride 1" higher than "stock."
Whether you want used springs, new stock springs, or a 3" lift depends on you and how you plan to use the Jeep. If you want to be able to run 31" tires, go for the 3" lift. If you want to stay on stock tires and just restore the stock ride height, the simplest route is probably the "home-brew" add-a-leaf (AAL) using another pair of XJ main leaves with the eyes cut off. There's a write-up for that floating around. You can probably find it by searching the modified forum. The link has something to do with "rockliz" but I don't have it bookmarked.