You could look at Specialized Mykas. They don't fit me but have a wide range of components which might fit what you are looking for.

I didn't try the Trek but it was one I was considering, I know my LBS is pretty keen on them but I would be leery to buy without being able to ride it. Can you try the one that is a little more expensive to see if you like the geometry?

They aren't making the Gary Fisher I have this year or else I would sing it's praises!