In the end I decided to order a Bianchi Pista frame and will build it up myself. Was going to get the Schwinn Madison but after all the money spent on replacing the cheap stock components it worked out cheaper just to start from scratch.