My Mavic Equipe rims circa 2005 are now worn out, and make me nervous. The front is 20H and the rear is 24H. I can't find exact replacements but have learned that DT Swiss and also Velocity make such rims. What would the experts here suggest? I can get new spokes from my LBS if needed.