Stripped off the speedo assembly today and found that the female part of the multi plug had elongated sockets. Just crimped them up a bit so that they're now round again, a bit of silicone based dielectric gel (from maplins) and it's now working fine.
Happy days.
Next job - figure out why the indicators work only with the lights on, and that's the front indicators only!
Something to do with when a previous owner bodged on the ex police fairing I'm guessing, judging by the choc block connectors added behind the speedo.