So after a lot of searching and little to no luck, I was able to order a set of Mavic CXP22 built on Shimano 105 hubs. We wrapped them in Continental Gatorskins, and despite one early pinch and corresponding flat, they have proven themselves to be quite sturdy. A big step up in quality, here’s hoping they last. Chris at Uptown Cycles was to source them through a company called Handspun. Thanks for the great product guys, and thanks to Chris for his patience.