Thanks for everyones help.
I ended up talking to Trek and there was no problem with a fork upgrade. I found a Marzocchi XC 700 on sale and went for it. 100mm travel with their ETA travel adjust for climbing. A lock out and rebound adjust with Air preload. Not a bad deal. All with an upgraded drive train (chain, Cranks/rings, freewheel/cassette).
This bike is awesome. A few more adjustments/tweaks and Ill have it dialed in.
Check out My bike pics for a finished product.[/img]