So I bit the bullet last week and ordered a Canyon Strive CF 7.0.
Assembled it last night, only took about 45 minutes, having never worked on a bike I thought that was OK.
Canyon have been great to deal with, and fast!
There are a couple of blemishes on the frame, I might give them a call...