There is a gunsmith that shares a building with Meltzers, which is located in Garfield on Outwater Lane. I have heard nothing but good things about him. Try calling Meltzers they should have the number for you.
I would also look into Griffith and Howe in Bernardsville. Pricy but top notch!
I would also look into Griffith and Howe in Bernardsville. Pricy but top notch!