My tach needle broke/vibrated off while on a high-rev portion of my ride yesterday.

I've had a lot of issues with my lights/guages due to vibration and my non-stock mounting solutions.
Anybody know of a rebuilding service for these guages? Bob (Bobz1?) used to do this. Has WG started guage rebuilding service yet?
I've seen the procedure for taking the guages apart, but am a little concerned about the likely results. I've got the typical wobbly needles (well one anyways), oil stain on the tach, faded numbering etc.
Help?