Harris Cyclery carrys the lights as well, probably bought from Peter White, but they also have a 36-spoke disk-ready Shimano dynohub machine-built wheel ready to go for less than $200. For an extra 12 bucks they'll re-tension and true the wheel by hand.

Hey - try some fatter tires. The extra volume will protect your wheels and you'll be more comfortable too. I doubt you'll notice any reduction in speed. My touring tires are 700x42.