I'm very biased and would recomend sticking to your first choice,although i do love the CubeIt's not summer yet, but it's nearly spring.. Time to upgrade methinks!
Initially was tempted by the looks of a Bianchi Via Nirone Dama, but I came to my senses and currently I'm divided between
a./ Cannondale Synapse 105
b./ Cube Peloton Race (triple or compact.. decisions, decisions)
Any suggestions?