Sounds like you're going in the right direction. For the front, if your shocks are good, they do make a shock stud extension. I've heard of them on franken-lifs but never actually seen them. New shocks shouldn't be too expensive, and not a bad idea if yours are older. Some big box parts stores, and even rockauto.com have shocks listed for 0-4" lifts. You could make/buy a conversion for the front shocks to eliminate that stud, and run regular shocks, like in the rear. As for the leafs, i'm not sure. you may have to mix and match after the front is done to see what sits the way you want.
1991 XJ: 35"s, 4:56s 5.5"LA lift, stretched, locked, skids, caged, high steer, spray paint. I think it was stock at one point.
<-1978 CJ5 parts - click on my classified