Don't you have another CAAD project on the go? Can I suggest the possibility that having one nicely specced CAAD (with hydro disc brakes), might be superior to having two that don't meet your expectations?
I've got a CAAD 7 Saeco. That one has Sram Red 10 speed, this one has Sram red 11 speed. Pretty nicely specced I'd say. I'm not going Hydro until I've tried and failed for myself with cables.
If it works, I expect apologies from the lot of you. If it doesn't I expect a lot of "told you so"s.
Don't you have another CAAD project on the go? Can I suggest the possibility that having one nicely specced CAAD (with hydro disc brakes), might be superior to having two that don't meet your expectations?