Yeah... after much tapping & banging (brass punch) and attempted sight pushings on a new-to-me 4506-1 with dead and dinged night sights I bit the bullet ( ) and took it to my local trusted 'smith. Couple weeks & $65 later I had my gun back just the way I like it. New sights & no mag disco.
Man's GOT ta know his limitations.
Say... I'm betting you could install one of those decock only levers in yer sleep?