hi Imi, re the spoke thing--I generally have always tried to remember to get a good wheel person to check my spoke tensions and trueness before a big trip. Your busted-spoke-athon happened because the tensions weren't good anymore, must have been on both wheels as you had issues with both wheels--unless of course you had other factors in play, way more weight on bike, or you really smacked off a curb or something.
You have so much experience you will know if this is the case.

re a bent disc. In my experience over the last 9 years riding and touring with my Surly Troll, a bent disc in regular riding just isnt an issue.
Yes, mountain bike riders smash into trees and crap, but for all the non mtb riding touring I have done, a disc has only ever been slightly out of true due to me mucking about with my mechanical brakes early on, and setting the one movable pad incorrectly, reather, setting the immovable pad too far from the rotor so the moving pad pushed the rotor too far and slightly slightly bent it.

I have had totally adequate success straightening my rotors using a clean adjustable wrench, used alcohol to make sure no grease or oils on it.
Yes, a proper tool would be nice to have, but I haave just never bothered to get one, given how both my bike and by wifes disc bikes really havent had the problem more than a slight little adjustment.
We have flown a bunch of times with these bikes too, and proper packing has meant rotors have been fine.

what brakes do you have on this bike?
mechanical, hyrauliic?
I have old school, simple , mechanical Avid BB7 mtb versions. Work fine for me.
Just had to learn a whole bunch of self doing mechanical skills with them. Frustrating at first, but finally got it figured out.
cheers