Tim,

Have you looked at the All City Big Block? It is track geometry, but All City is marketing it as a fast and comfortable frame. The fork is chromoly, but could of course be changed. There are cable stops on the frame, but only 1 set of water bottle brazeons. Might be worth a look:

https://allcitycycles.com/bikes/big_block

Plus the paint is pretty amazing!

Did Wabi give a lead time for the next batch of lightning frames?

Dave