Linear pull brakes are just fine for most applications. If you don't have the hubs, I probably wouldn't bother with upgrading to discs, although you might think about picking up some XT V's as a solid upgrade, as well as some Koolstop pads.
AND IT'S BRAKES! B-R-A-K-E-S!