definitely upgrade the forks. i'd go for the marzocchi comp eta forks, and fsa riser bars (no extra)...if you're feeling flush then get the easton risers. yup the second choice down (deore group/magura discs and xt f&r) would be hydraulic...
good find!