I doubt using the gun is going to make it better.

Cole Haugh told me he pretty much rehardens everything Spanish that comes back in for work. You are going to need somebody to get in and work on the guts. Dewey Vicknair had an AYA number 2 come in for a spring, and took photos of the original and his replacement, and posted them on his blog. Good information, and it got me over ever wanting a Spanish sidelock.
Your gunsmith told you the truth, and if he is busy enough with wood and stocking guns, more power to him. You just have to find a qualified guy to do the metal work. Several names have been mentioned.

Good luck.

Best,
Ted