Speedo and fuel gauge replacement

I’m finding lots of info on bezel restoration, but very little on oe-style gauge replacement purchase options.

1969 Barracuda project car

Speedo
My gauge “ticks” (like a signal) and bounces like crazy. I replaced my Speedo cable with a new unit (also lubed the cable), thinking the square gauge end was warn, but no luck. It still ticks and bounces. So, I’m assuming the problem is in the Speedo head/gearing itself. I can’t find where to purchase a replacement oe gauge... help?

Fuel Gauge
My fuel gauge is totally dead.. doesn’t move. I have a new fuel tank, new sending unit (resistance checks out fine at various levels).. I have voltage all the way up to the instrument panel. At this point, I’m assuming the problem is in the fuel gauge itself. Can I purchase an oe replacement, if so where?

As you might imagine, I’m getting pretty good at estimating my fuel level after being on the road all summer, but my plan is to pull the cluster and restore it over the winter, so I’m looking for oe gauge replacements.

Thanks for any links, etc!