The CdF has a shorter stem but it has a higher headtube length, the top tube length will be down to a longer wheelbase and different BB geometry. I think the one you've ordered will fit. I think you'd probably fit on the one above but if you've often felt stretched out then the XS will probably be right. Mythtse is right when he says the greater drop to you Colnago bars will make a difference, you won't get that with the CdF, so it won't feel as far away.