So I went to see my mechie today and he had a good listen to the engine. He doesn't seem to think it's the lifters making the noise, but might actually be the injectors (or maybe just one). To be sure though I have to book the car in so they can investigate more closely and hopefully discover where the clicking is coming from.
It never ends...