Go with Woody's. Send the wheels to him and get the Excels instead of the Suns. You can't use standard rim locks with the Suns. If you ride it hard you might up the front springs. I raised the oil level to 100 mm trying delay buying new front springs. He was able to use my stock hub and the stock front spokes that look very strong.
Who told you the stock rims were high quality?