Do a search for gunsmiths in California.
I know there are a couple of "name" smiths but their turnaround will be longer.
Some in Nevada, AZ, and Idaho but I am not sure those are handy.
I will bet that you can find one thru the national gunsmith organization.
Blessings