I hope you do well in your search, I sincerely wish I could help, as I wish I also knew someone.
The gunsmith I use does my work as a favor. He is no longer accepting walk in trade, only doing custom center fire work.
Our wives get along, they trade receipes. My wife takes him some of her baked goods once a month or so, call it a bribe if you wish.
There seems to be a lot of rifle builders and a a shortage of those who build pistols and work on them.
If you get some positive responses, please send me a PM, I am leaving early on Monday or 2 weeks or so.
Pistols are my weakness and true love.
RDE