I apologize if this has been mentioned before, as I haven't read through this entire thread, but looking at your bike's wheels above, think about sticking an extra spoke in your panniers or tape one to your chain stays, or at least consider throwing a Fiber Fix spoke in a bag. If for some reason that you break a spoke, that particular type of spoke pattern and minimum number of spokes is extremely difficult to true well enough to be able to ride if one does get broken. But then my last name should have been Murphy.