Just a quick update. For now, I am looking to buy replacement wheels. Found 2 sets at SJS cycles.
Wheelset 36h Grizzly Rims with Shimano Deore Black Hubs.
and
Wheelset 36h Ryde Andra 30 Rims with Shimano Deore Hubs in Black
Any opinion on either rims?

I will wait to see if there are any Christmas sales.