I'd second BD suggestion about the Roubaix and Secteur as well as adding the Synapse Cannondales, too. Those Surly bikes that Len suggested could all work, how about a build like the gravel bike that BD built with an emphasis on road use as far as tyres, bars and wheelsets. And, if you like Rivs, why not look at one? If I was going to buy right now it would be between a Roubaix and a Synapse with my own set up and 28 tyres, 32h wheels and drop bars/ modern components (no Di2 or EPS though.) This should be interesting if you do begin a search, keep me up to date, please.
Bill
__________________
Semper Fi, USMC, 1975-1977
I Can Do All Things Through Him, Who Gives Me Strength. Philippians 4:13