'I'd be interested in how your disc upgrade goes.'
Ikegarch: the rotors and adapters are on order and should have them early next week. I'll post to let you know how it goes. I'll probably reassemble everything and go out and make some adjustments and see how the newly cleaned rotors and pads do. If they still slip after the ride, I'll just replace the pads. I'll also probably unmount the wheels and check and perhaps bring to the LBS for a professional retensioning if they sound bad.
Where did your spoke break? At the nipples or somewhere else?
Thanks,
INDY Bob