I have a 600AT New Haven that the safety broke on (big surprise). My research found that the safety switch and the block inside of the gun should be the same as for the 500. The problem that I am having is that when the block is installed, you can never release the hammer. The trigger is always...