If you're doing moderate trails on 31's just get beefier stock steering. Unless you WANT crossover. You'll need at least 3" of lift before the crossover will fit/work right, so you've got to consider that.
Again, only doing moderate trails, I'd just rebuild the knuckles and MAYBE go with stronger birfields. I a ring welded on mine, similar to some of the other designs out there.
If you aren't doing things that require lockers you might as well stay with the stock/slightly stronger stuff and replace as you break stuff (hopefully trying harder stuff) or find the need to upgrade.
Just my $0.02
