Also, spoke upgrades (as in thicker spokes) are nonsense, unless you started out with 15g spokes. 14 gauge double butted stainless spokes, a strong (usually also heavy) rim, preferably 36 hole, and a good wheelbuilder should get you sorted.