Nice looking Jeep! Much cleaner than my '90.
I like the choices you made for the suspension. If you are only going to run 33s, then the 2.5" + shackles + 1" body lift is the way to go (vs 3.5" + shackles). I think the 3.5" springs are possibly a little too arched for me, plus with the body lift you could do 1" motor mount lift and a flat/nearly flat belly pan to give some nice ground clearance under the frame.
If you have a second vehicle and can handle a week's downtime on the rig, do the SYE install, take your D-shaft measurements, and give Tom Woods a call. He'll have a new CV dshaft to you in a few days for about $300-350 shipped. If you plan to go to the 8.8 later, you don't have to worry about changing the dshaft length (unless you do a stretch). So don't let that hold you back.
Also, TJ rear fender flares will prevent your tires from contacting your tub on a hard bottom. Easy to install and they show up frequently on Craigslist for under $60$
What rims are those? They look nice!