Ok so I had to take the instrument cluster out for another reason, i.e. to resolder the pins on the round connector. While I was at that point I decided to lube the speedo gears that I replaced but didn't lube so I could stop the clicking. I used Lubriplate fishing reel grease in a small tube. I turned the gear using a small screwdriver and put grease on the gear, wiping excess with the screwdriver and relocating the excess to a different part of the gear until it had white all around but not too much.
In hind site I should have removed the clear plastic cover and done the next inner most set of gears as well as I can still hear them sometimes. But then some of my friends call me Radar. The Speedo fix on an SD is relatively easy.
The shaft you are speaking about has a motor attached to it, be careful with it, try lubing the gears on the end of the motor shaft.
I love this car and I love this site, Thank you.