A friend of mine has a caad 8 5, he upgraded the wheels to ksyrium elites and the crank to an fsa sl-k light. Go for whichever you feel you'll be happier with, the upgrades or the complete new bike.