There are several companies that make rear swap kits for TJs, such as M.O.R.E., that include coil buckets and link mounts, etc for the swaps. Sounds like you're on the right track; good luck with everything.
Here's a link to one: http://www.tellico4x4.com/product_info.php/cPath/2297_2590/products_id/19271