As for the oil pump chain kit, the kit turned out to be incorrect and I was able to return it. A well-known local VAG repair shop has great local availability of genuine spare parts, so I took my old oil pump chain and sprocket with me. Bought some other parts and asked for comparison. Draped my "old" chain and new genuine chain on a pen - there was no difference in length! Also no difference between brand new and old sprocket, so a 100€ saved there

So just bought a new genuine chain tensioner and reused the chain and sprocket.
Since the lifters are quite cheap at 2,7€/piece I just opted to replace them all. Installed the camshaft module and Febi Bilstein updated chain kit. To make absolutely bang-on sure the first cylinder is at TDC, bought an indicator dial gauge and carried out installation of the chain kit, using Chinese T10171 and T10340 tools. I wasn't very sure about these tools as I got to compare them to genuine tools, but they worked a treat. I quadruple checked the timing between all work steps, so it better be good
Essentially the engine is now 99% put back together. I only need to fit the sump and gearbox and then it's only a matter of putting it back into the car
