Nick, sorry my 5 and 6 is your 1 and 2 so perhaps this explains it? I saw the bock yesterday, it's completely stripped and they said they have checked all the oilways.
The engine guy now regrets not putting a new oil pump in........I didn't tell him not to! A rooky mistake for such an experienced company.
The supplier of the new pump is apparently, allegedly, hopefully fine as he has put them in several racing and fast road Triumphs.
Iain