Adam - you know , we discussed it before and are you going wednesday - DCO meet ?
Going back to op's original problem.I would definately suggest fitting a spare set of tappets to see if the problem goes away.
Horney, spare engine fitemnt isnt an option, and DH wouldnt talk to me again, ABF will be sourced if i rmove the lump as a last resort.