Matt.... Next door in Alberta Gary Clennan is doing fine work at reasonable cost & in Cdn loonies $$....& has worked on just about anything imaginable. He's replaced a broken rangefinder glass on a Leica CL (found NOS part !)...& reformed the bent top....serviced a Perkeo ll and a Canon 28mm LTM....for me. Check out his website &/or instagram page.... www.lensmedicyyc.com
I always appreciate a recommendation, even if they are a 950 km drive from here.