Where are you located?
If you are in Ontario I'd first suggest Steve Milton at Precision Arms. Second would be SC gun works. Don't expect a quick turn around depending on what needs to be done. Neither outlet is a site sponsor but you can find them by googling their names.
Another option might be contact Perazzi Canada although it's hard to know what there status is these days. They may be able to recommend someone.
It is unfortunate that Dan from Giacomo Sporting no longer comes up to St. Thomas. IIRC, the last time he was here was 2010 and he reworked my MX8s.