Yota axles questions

[67fastback]

Ok, I have maxed out my sami axles and I keep braking stuff...
specs:
5.38 gears
lockers front and rear
chromoly birfs
calmini hd rear axles
disco brakes in rear
4.1 tcase gears
on 9.50x16 ag tires.

now looking around it seems that the 85 yota axles 4.10 are the ones to find and get for a new swap out.

what is the most bang for my buck to upgrade on the yota axles to get something close to what i was running with the sami axles?
5.29 gears?
chromoly axles and birfs?
weld rear and detroit locker front? pro/cons ?
trail gear lockout coversion?
6 shooters?


oh yeah still running tracker p/s with mod pump and cooler.

Any issues that some one can see that I will need to swap some thing out for the steering (full hydro but not in the budget yet...), braking,etc...