There is a fellow member of this site that makes those sort of things. I never used his service, but he sounds like he is keenly aware of his craft.
I hope I am not breaking any rule. His "handle" is DeShivs, maybe Bill, maybe some other first name.
And being from NJ, I understand and appreciate the effort you would put into a gun, that people from free states would simply sell and replace.
Good luck
Rich