So update on my speedo issue - after pulling it and greasing it, it worked but once I got to about 50 MPH, it went bonkers again. So, instead of pulling it and greasing again, I opted for a new one.
When I put it in today, and took it for a ride - no bueno. :-(... Brought it back and pulled...