rebuild & retension is a good cheap idea.
I've had amazing luck with the entry-level $250 Cane Creek wheels. on my 2nd set. first set has prolly 15,000 miles, rear trued once. then went to disc, new set has maybe 1000miles.
built in u.s., awesome support, very stiff and snappy acceleration.
Cane Creek invented the hi-tensioned, nipple at the hub design. Shimano licensed it. They're very very good.
cheers