LX crankset above looks like a good deal. Have you considered a rigid fork? (sorry if this was mentioned already I just kinda skimmed down here.) I'd pay the extra for the BB7's over the BB5's. there are deals to be had everywhere and they're a much better mech. disc brake. Not sure about shifters (I'm ss only) but avid's fr5's are $25/pair and available anywhere.
Good luck and be sure to post pics!