IMHO, it depends on your budget. I believe you're almost money ahead to just buy some new springs. I'm running stock XJ springs on my "Jeep" (sourced from Teraflex) and have had good service from them. I don't remember the exact price, but I think they were $125 per? It was a while ago, so that price likely doesn't hold any bearing on current market conditions. At worst, it'll give you a good place to start.
I'm not a fan of blocks on an XJ at all. If you do, I'd stick to 1" or under. Definitely do a longer shackle, that should get you another 1" or 1.5" depending on what you buy. I had good luck with a full length add-a-leaf as well.