Very interested by all the tinkering you have done, bought the gear upgrade and have purchased some zoom hb100 hybrid disc calipers which are a very decent half way house between hydros and cable discs and mean don't need to mess around with new levers/switches.
Have to say the fold mechanism...