I'm not sure what you want to spend, but the first thing that came to mind was a soma ES. It has stable geometry, clearance for wide tires, and an extended head tube io keep the bars more upright. It looks well made and has a prett fair price.
http://www.somafab.com/archives/product/es
If you were so inclined, most of your parts from the caad 10 would fit on here. The crankset, headset, and FD may be the only exception. If you are not afraid of eBay, your caad10 frameset and parts tht don't fit will likely cover the cost of the swap.