The next day I purchased a can of Wynns Hydraulic Valve Lifter Treatment, which is the sort of product I normally treat as Snake Oil, but I thought if it works then it will save a lot of time.
Instructions say to add to warm engine, so started the engine and was pleased to hear no rattles, it seems the problem cleared itself overnight.
So I now have a £10 can of treatment on the shelf for future use.
Better than that I have a very happy wife (its her car) and some time on my hands to work on my own car.