Audio Technica AT ML-180 Cartridge Advice

Just acquired an Audio Technica AT ML-180 cartridge with broken cantilever and was looking for advice on where to get a new cantilever rebuild and what material to choose from. My preference is a new Boron cantilever but was not sure who, apart from Soundsmith, offers this service.

Also would like to know which is the best tonearm to use for this cartridge once it's fixed. It can either go on my Audiomods Series 5 (eff. mass approx. 11g) or the arm on my Yamaha GT 2000 which has an effective mass of approx. 20g.

Thanks in advance.