So, I finally got around to looking at this issue Barry. I used a toothpick to get a dob of gel superglue onto the shaft/gear wheel and it seems to have worked ok.
My speedo has the trip meter reset button protruding through the front glass and this obviously allows water into the instrument and there was plenty of corrosion and oxidisation going on.... i cleaned the rust away from the joint as best I could before I glued it and after the superglue had set, I gave everything a good soak in WD and freed it all up as much as possible.
The only advice I can offer in terms of the crimped cover is to insert a really fine screwdriver blade under the crimp and then try and work it around between the crimp and the case rather than levering it repeatedly the whole way. The less you can distort the (very soft) crimped metal, the better I think. I still used a smear of silicone when I resealed it though to make sure it stays sealed.
I ran it for 30klms or so yesterday and both trip and odo worked fine and the disassembly and cleaning has stopped the needle dancing around and the speed seems to be reading pretty accurately.