I hit the thumb safety sometimes when moving or picking the gun up from a table. This is series 80 combat government and the safety is kind of extended and ambi. I am right handed. I have a series 70 with a shorter safety that I don't hit as much. What is best - tie the safety down some way, or replace it with an old-style safety, or purchase a more extended safety? Also, I don't feel the need for a thumb safety if it can be disabled.