I agree, send it back to S&W, so its done correctly. Call them up and explain exactly what you want done and include that in a letter when you ship back to company.
I just did that with Springfield Armory and the work was super and very thorough with a quick turn around!