Not personally a fan of Rivendell myself, but to each his own....
Your best choices have been covered here; recumbent for better aerodynamics, or cyclocross if the roadie doesn't do it for you. The 'cross was gonna be my suggestion, but the 'bent sounds better.