Quick update: The rifle has been at Springfield for 5.5 weeks right now. They estimated 2-4 weeks, but so long as it's fixed properly I don't really care if it's an extra week or two over the estimate.
They tested the rifle, and sure enough, it performed the same way it had when I was behind...