TD,
Sorry about your troubles.
First off, any gunsmith worth his/her salt would fix the damage they caused. Have you spoken to them about the damage.
Second, one of the great things about a 3gen smith is how nice you can make old trade ins sparkle like new. A scotchbrite, some rem oil, and...