I ordered a set of Gotoh GB707 tuners today.
Considering a 201-4B bridge as well.