A few years ago, my son had a similar problem with a Glock 10MM and I convinced him to trade it on a new Glock .40. Later, I regretted that decision when the gunsmith at the shop we traded with said it only needed a couple of new parts and was functioning fine. He didn't say which parts, so I can be of no help there.
Is there a legit reason that Glock won't use Underwood? I have no experience with them.