I wouldn't just assume that your CAAD fits you perfectly without actually having tried something larger. I'm 3" shorter than you and ride the same size frame as your CAAD, but with even longer (120mm) stem. Without more information its hard to be certain, but it is probable a 61cm frame with a 110+ mm stem would fit you just fine, if not better than your current 58.