Thanks for everyone's contributions here. I seem to have solved the problem in the main by acquiring a (non-Leica!) screw-on lens hood for a few pounds on ebay- I hardly get the problem now. It does seem to do a better job than than the retractable hood in the lens.

Thanks for all your comments.

Adrian