Well I would not be able to choose between those two bikes as they are both great! It would come down to a personal decision. I really like the X01 drivetrain and would be using it if I road gears. It looks like your budget is pretty good, but are you set on a carbon frame? I only ask because I know a lot of riders that go carbon then usually end up going back to a QUALITY steel tube set or titanium. If it were me I would look into a custom built frame in Ti. Here are a few of the reasons why:
1 - I have never been a fan of carbon frames, they just don't give the ride of a quality steel frame or a Ti frame. It feels like I just cant feel the trail on the carbon where a quality steel or Ti frame feels alive, just more fun.
2 - durability Even though the carbon frames of today are nothing like the carbon frames back "in the day" they are still not as durable as a steel or especially a Ti frame. However now there are some good shops offering quality repairs for carbon.
3 - A custom frame can be made to a standard size or custom fit to your needs and likes. So best of both worlds.
4 - I enjoy riding a custom built frame for the simple fact that I know the person or people who made it love what they do. Its a lot like shooting a custom firearm made to your specs. You can discuss ideas and needs with the builder before the build so you know what you are getting. I think it just adds to the experience, maybe that's just me being odd but what-ev...
5 - You can get frame with sliders so if you wanted you can convert it to a SINGLE SPEED!!!
As you can see I am a big fan of custom built bikes. It may not be your thing and that is cool, I just thought I would throw that out there for ya. You are in a great area for custom bike builders, there are several in the Bay area which is not down the road for ya but drivable.
I hope this has helped more than hurt you, but the most important thing is once you pick a bike out get out and enjoy it!!