I have Hunts and more recently bought the new Shimano GRX wheelset for $419. I'd go all in on the GRX. It is very well made and no cut corners. They have been making wheels for decades. And if you have a warranty issue, just about every shop can handle it. Very trusted Shimano, generally overbuilt too. Cheaper to service too with loose ball, which many of us still prefer. Loose ball is quick and easy to service, has less drag than many mid-priced sealed bearing hubs and you never have to wait for parts to be ordered. I'd buy the GRX wheels from a local shop as it will be the same price there as on line. And no shipping or waiting if they stock them. A great upgrade for many stock bikes under $2500.