If you need to rebuild, take the opportunity to upgrade from straight gauge?

I always order spokes from Yojimbo's Garage in Chicago. Great to work with.