Ok so. I'm going with the Audax End-End. It's basically 90% the bike I want. I just sold my '03 Bianchi Pista, since I don't commute anymore and racing it seems to be a pipe dream now that I have a new daughter...

So really the only things I don't love about the A:E-E are the head-tube derailleur cable stops and the rear break stops on the top-tube. I really prefer down-tube bosses and the 3-guides-on-top style cable routing... but I can save that for when I order a Mercian in a few years

But really for $650 shipped you can beat it!