You should be riding a 60-62cm frame. I have the same measurements and ride a 60cm Cannondale. I've heard LBS employees say I need anywhere from a 58 to 62 but 60 seemed perfect. It all depends on how you like to ride. I also came over from mountain biking 2 months ago.