I gave the Pilot a fettle this evening as I'm going to try and get out on her tomorrow. Trued the discs up as the rear was rubbing slightly, plugged the Di2 in to charge and oiled the chain. While I was doing so I noticed the BB felt a bit stiff and remembered I'd bought a new bearing for it
After a few minutes of searching I had located said bearing then removed the crank arm and non-drive side BB cup... It was a bit grim but felt a little better than it had when I'd previously inspected it - I'd flushed it and packed it with fresh grease at that point which has helped.
Anyway, out came the big hammer, vice and Hope bearing tools and then out came the old bearing
It drifted out fairly easily with a coule of good square whacks.
I cleaned the cup up then carefully wound the new bearing in with the vice and tool, loading only the outer race so as not to damage the bearing surfaces.
Great success. A few minutes later it was fitted back on the bike and the crank bolts had been torqued up. It all feels a little smoother now, hopefully the annoying click has gone too