Maybe check with Buchanan Spokes & Rims. They just built me a complete 21" wheel on an Excel rim using upgraded gauge spokes. Drilled out factory...