I did the same thing and bought the Cannondale Cyclocross; coming from a hyrid, it's a great transition. The gearing is a little different, and the geometry, but minimally. It's as fast as many road bikes I tried. I love it. Maybe next year, if I need more of a road workout, I will purchase a full roadster.

Urbanmonk