You probably don't need new hammer & trigger, don't be too paranoid about hair trigger. Can you forcefully push off the hammer at full cock? No? Then new hammer & trigger are not necessary. My bet is the spring strain screw is backed out, a common "fix" to make the action smooth. Beautiful gun...