Rich, pick up a set of used YJ front springs for $50 or less. This will make all 4 of your add-a-leafs and you're guaranteed the same spring rate all the way around. Use the top two leaves of each pack, cutting the eyes from the main leaf.
You can use the same shock, it only adds about 1.5" to your stock springs.
I'm using 32"x11.5" BFG MT on stock 15x7 5-spoke stock steel wheels, they rub the springs a little but not too bad. Aftermarket wheels with less backspacing is the best fix. I may get four 1" spacers someday cuz I wanna keep these stock wheels, great protection of the valve stem, I've seen them all to often ripped off other rims.