Hi, this is what I would go for:
1. Wheels, hand built Shimano XT hubs (even disk hubs as they can be used again if you go for another bike) with Mavic cross country rim, something like a XC321.
2. Brakes, XT v brakes (even just the brakes, use current levers)or Magura rim brakes...