For the front I would just try to find some '95 and up factory shafts and keep your current ones for spares.
If you have the 8.25" out back then it will have the smaller shafts ('97 & up have 29 spline) but that doesn't mean it's a horrible axle.
Quick run down of where I'd start...
More protection - rocker guards, gas tank, TC, etc.
Aussie or lockrite up front - if you have the 231 TC if not then ARB
Upgraded ujoints/shafts ('95 & up) up front
And the most important thing you can do is join a club or association