Yea, the 04's are getting pretty hard to find. If you find one, you almost have to make the decision right then. I missed the 04' Expert by one day. Ended up getting the 04' Elite.
The XC will be just fine and is capable of a lot. I used my Stumpy FSR and a friend used his new FSRxc bike while in Moab. He did great and had no problems with the XC bike. He loved the way it rode and did some very nice climbs......with strap pedals.
If you do plan on keeping the bike for some time, you might consider the Stumpy. If you think you will replace it in a few years, then go with the XC.
Good luck and either bike is very capable!