I've had good luck with NECG.

Also, if Herbert at Merkel USA (www.merkel-usa.com, and formerly GSI Firearms) is still there, he is an excellent gunsmith.

Good luck.

Tom