Source needed for Spline Form gauge (GO and NOGO members)

I am looking for a source (preferably in Canada) that can manufacture spline form gauges. In the past, I have worked with Delta, and with Western Pegasus. Delta is no longer making splines, and having a 'sole source' for critical measuring equipment is not a good idea.

Does anyone have any recommendations? Preferably the supplier will be ISO 17025 registered, or have a working relationship with a registered lab, so that they can also take care of the calibration of these gauges as well.