Does sound like time for a 'specialty clinic.' It would be invaluable to be able to go over the gun in person with the smith to discuss options for repair and refurbish, and I do have two names in CA:
Freddie Brunner Escondido, Ca 760-738-8413
Pete Mazur Grass Valley, CA 530-268-2412
My first two choices would be one of these master smiths: