...I also need to qualify with it in three weeks and figured I should ship it ASAP to get it back on time...
You mean to say that this is your ONLY handgun? I don't want to chastise you as perhaps you are new to shooting, however, buying a handgun specifically to take a CCW course only a few weeks before is not S&W's fault. S&W will take care of you and rest assured that every returned handgun is duly noted and the person who did the initial work will be spoken with.
A problem is that today's society is not mechanically apt. We have engineers in this country who can't even turn on a lathe. Try & find a good local gunsmith who can work on these type of problems. You can't. We have taught our children to believe for the past 30 yrs. that a mechanical trade is for ignorant idiots and smart kids go to college. What's left is a lot of "flotsam" that couldn't get into college or didn't go for whatever reason, hence they go into a manufacturing job as it is the best paying that they can obtain. We have also shipped most manufacturing overseas and only the very high ends remains apart from most gun manufacturing. These are the people that S&W has to hire as floor workers and to try & teach them these skills can be an uphill battle. Colt for instance recently had ONE man aged over 70 doing revolver repairs and rumors are he's now gone. It's damned hard to teach these skills as the people most apt to learn them have gone to college in today's world and to a better paying job.
I am not making excuses for S&W but rather merely explaining to you the 'bed' we have made for ourselves here in the USA. It's a Walmart world now.