Thought I'd pop an update in as it's been a while. I got a bit fed up of the cable discs last month, it seems like they need a lot of adjusting which does my head in really!
Partway through an upgrade to hydraulics, which also means making the jump to 11 speed. Ideally I'd have Ultegra throughout because the drive train components are fairly affordable second-hand, but the shifters hold their value, and, as it's a bike for riding on any terrain I'm going with function (and affordability!) over form.
In the end I'm going with Ultegra 6800 Cassette & Mechs, 105 R7020 shifters and post mount Ultegra/non series calipers. Awaiting a chain and gear cables and I'll have the gears all set up. Will leave my LBS to set the brakes up.
Pictures to follow!