I have a set of Gotoh Res-o-lites in one of my basses. They are really great tuners.

For the bridge, if you are going high-mass, I have a couple of Sung Il BB404 bridges that I really like.

https://www.ebay.com/itm/371917265109

Same company that makes a lot of Wilkinson parts. They're cheaper than the Gotohs and have locking saddles. Not as vintage a look as the Gotoh's though!