After multiple times of removing and refitting tank to check connections on the speedo wiring I finally gave in and bought a second hand unit. best time ever for tank off, front wheel out, speedo unit swap and refit, everything works as it should!
I might even clean it now.......