Get in touch with Dave. He's in NorCal. In Sacramento. His callsign here is 1911whore. He's top notch. I'm USASF and he does all my gunsmithing. Anything beyond my expertise.
Highly recommended. He's especially good with handguns. But I'm sure hell do an amazing job for you. His Glock work came in handy in Afghanistan for me. I definitely owe him a beer.
So get in touch with him. He'll get you squared away.