If you like your Urushi then I would wholeheartedly recommend having MoFi Distribution handle a “factory” rebuild.
Having dealt with a large number of new & rebuilt Koetsu pickups over the years I can say their rebuilds look like they were built by a robot with better than new alignment/geometry. Highly recommended. No affiliation.