I wanted to thank everyone for all the great suggestions! The weather is finally turning for the better and I will be bombing around on my old Trek 930 until I decide what to get next. I've been visiting a lot of LBS's and will start test riding soon. In addition to the bikes already mentioned (and that Marin certainly looks awesome!), does anyone have experience with Scott bikes? The closest LBS sells them in addition to Eastern Mtn Sports (here in NH, there is an EMS about every 25 miles).
Thanks again!