Xander (and others)
I appreciate that I may be bolting the stable door when the horse is already down the pub but.......
I have just bought an xt600 with a duff back wheel
M&B Engineering are 10 miles north of Worcester in the Midlands and they have been brilliant and helpful in sorting out the whole issues of rims, spokes etc etc 01584 881433 - old fashioned, knowledgeable, straightforward, skilled etc etc
I am a firm believer in getting the right man to do the right job and I have learned the hard/expensive way that thats the only way to do it. Different rims have different spoke offsets and all sorts of stuff which is why the xt600 I have just bought had 15 broken spokes on the rear rim.
Wheels are put under a might strain if you are having a laugh doing 80mph on a graded road somewhere and for the sake of a few quid, maybe its worth getting someone (like M&B) to give the wheels a once over
cheers
Dick