Just a thought, for people before they spend too much on original forks:
My originals that I used last year are (i think) slightly bent. Getting the sliders back into after taking them out for a service was pretty tough. Can check to confirm it later.
Before I started last years ride, Simon Pavey who raced one in the Dakar in 08 had briefed me that the stock XC stanchions (tubes) were made of a soft metal on the XC. After bending 3 pairs, he swapped his stanchions out for same sized but better metal units from a HP2.
Only problem is, since they dont make HP2s anymore, the HP2 stanchions are rare as hens teeth and super expensive.
Just something else to bear in mind.
Maybe the shiver stanchions will fit? Are they the same length?