I'd go with the Civia because of the LBS connection to service. Be prepared to have a very heavy bike, I have a Shimano 11 in a Ti frame and it's kind of heavy if the frame was steel it would be up there in weight and if you plan on having a rack, and water bottles; oh boy. Adding a rack and fenders will be a test of your mechanical abilities as neither wants to play nice with discs.

My bike is a commuter and is fine for slower rides. I do like discs for wet weather riding (which we have had a lot of this year), so I am currently looking for a light weight road bike with disc brakes and the ability to add fenders right now the Volagi is the only choice but now that disc brakes are allowed on cross bikes, there should be a slew of disc (kind of) road bikes coming to market.