Thank you everyone for the suggestions and info. I know a lot more after reading through this and looking things up than I did a number of days ago. Yeah, 36 holes and light do not go together anymore. It looks like I'll be spending a good chunk of change for new wheels, or build something up a lot cheaper (sun ringle rhyno lite), heavier, and without the ability for tubeless. More decisions and trade-offs.
What I really want is a new bike, but we all know how that is going right now. I just asked one of my local LBS when they thought they would have any Jamis bikes. They said they might see something trickle in this coming fall, but they're not counting on it. Same story everywhere around here.