Sounds like you have a plan, but I'd start with the shocks. I just replaced mine in the rear with Fox Performance 2.0's. Super happy with the ride quality. 2 bolts per side... 15-20 mins...
Hola! Been around Jeeps my whole life and FINALLY got one for myself! I split time between Fort Worth and Denver. So, she's (RUBI-C) going to see some miles. Anywho, been enjoying the Colorado trails and Bridgeport TX so far. Hope to see yall around!