Don't mess around, send both of those instruments to someplace like Palo Alto Speedometer. They did both of my instruments a few years back when my tach started sounding funny and they came back looking like new. My recollection is that they guaranteed their work as long as new M-B drive cables were installed when replacing the instruments in the dash, which I did.
Both ends of speedo and tach drive cables should have the square end.