If you really want it fixed, ship it back through a dealer. Should only cost about $20. I had one shipped a couple years ago for $12.
My car breaks the dealer does not pick it up, take it to the shop, and return it.
If you really want a no questions asked full life of the gun warranty, buy...