Don't be too turned off by their timeline for repairs.
They will indeed rush it back ASAP.
Giving exact timetables can cause more problems than saying nothing.
Couple months ago, my Shield 40 only took 4 days for them to correct 4 issues with it, (mag drop, short front sight, hanging off the left rear sight, trigger job, all free under warranty).

At least you can be thankful you do not have another popular handgun from a different company, where they require 6 weeks after receiving weapon before they even start to look at it, and phone calls prior to the 6 week time always end with, call us after 6 weeks.