Cannondale Aficionados / Owners

Anyone on here find recent CAAD top tubes far too wide?
I've been riding a CAAD8 (from factory Sora-equipped bike, w/BSA threaded BB, @colin2011 ) for a few months, but think I'm going to have to get rid of it because it hurts!
Order of thoughts/injuries/adjustments:

• CAAD8; first road biek, after riding track etc etc...
  
• Developed knee pain on short rides >50km
  
• Figured something to do with Q-factor
  
• Moved cleats inboard to compensate for wider Q of (DA7800) road c'set.
  
• Adjustment caused knees to hit/thighs to rub TT when pedalling, particularly when out of saddle.
  
• Subconsciously began to modify shape of leg to avoid this while pedalling, particularly when out of saddle.
  
• Developed hip pain of rides around 50km as a result...
  
  

Anybody else experienced this/found a resolution?
I stripped the parts and put them on an old Raleigh 531C frame (skinny top tube) and it feels (heavy, but) sublime by comparison, so If anyone wants a (raw) 'dale frameset, let me know.