So, I decided to go with a rebuild on my hub with a new rim and spokes. This is a shop that I trust, but not the shop where I bought the bike. They're going to use DT double-butted spokes and brass nipples for some strength. This should result in a quality wheel without putting the $400 or more into a new wheel set from Peter. I just can't justify that kind of cash at the moment. Only down side of this approach is that I still get a 32 spoke wheel instead of being able to move up to a 36.