i would definitely replace that tie rod with the worn boot. ( having the torn boot radically decreases the tie rods life.)
throughly go throught the fluids ( tcase, axles, oil , and tranny)
Personally i like your previous rig (just more my style)
To make it more capable it could be lowered 1.5-2"s ( for center of gravity reasons)
I would change the tube bumpers and add one with a winch( i think they only look good on cjs - along with the chrome IMO )
Also tsl sx's which are more puncture resistant ( sx indicates a bias ply tire which some people say can get flat spots if left to sit on a vehicle for too long ... others say once heated on the highway "flat spots" go away....) are not very good on the road ( hard to balance/keep balanced which attributes to increased bearing/suspension component wear) i speak from experience they are down right unsafe in rain and ice ... due to the lack of siping( you can have them professionaly siped at some offroad/tire shops). a radial all terrain would be better suited for daily driving.
Also 36" tires will definitely pushing your axles to the limit ... lockers would decrease the life expectancy as well.
this all aside .... The sx's are amazing in the mud, only tire that i have seen out perform them is the boggers and ground hawgs which are much worse on the street.
Also for safety reasons i would consider a brake upgrade ... atleast get some hi end pads
or even cross drilled / slotted rotors ... 36's are a lot of weight to stop
If i were you i would lower the jeep 2 inches (add bumpstops), keep the sx's for offroad use only, get some 35" a/ts for daily driving/light trails, add new front bumper with winch, add lockers and chromoly axle.
This rig would be unstoppable.
Also it would help to know what type of wheeling you do ... as well as how frequently you do go wheeling. Along with if this is your daily driver or not
please take everything i said with a grain of salt... it is peronal opinion and suggestions. i mentioned what i like .. but the great thing about jeeps is that you can build it any way you like!!!!
sorry for writing a book