A 54 is probably the correct size. I'm just under 6'0, have ridden a size 56 Cervelo for years, and could have easily sized up to a 58, or down to a 54, if needed. I'd probably opt for the larger frame if I'm on the edge. Larger frames just feel more reassured and relaxing for me.