On the vintage front, you might consider a Cannondale ST series. I have a 90' ST600. Ya, it's a little heavy (over engineered in good ways), But it has roadish geometry and rides like it. Here is mine with 38mm Panaracers.
IMG_0052r by
Robert Copple, on Flickr