Quick update on the berlina - new fuel pump, plugs and leads fitted and she starts first time, every time.
Delighted, and thank you for all the useful tips and suggestions. Looking forward to a few runs out locally now.
Having collected the car I got a second opinion on the engine noise and the first suggestion was to check the valve clearances. With the cam cover off the chain can then be inspected in situ.
To my untrained ear it sounds no different to normal, and it drives no differently, but I will limit myself to short trips until I can get it into the 'new' workshop.