Simple enough fix - change the hammer or change the grip safety. Of course, it's not really that simple, because changing the hammer requires matching it with the sear, trigger, and thumb safety. Changing the grip safety MIGHT require recontouring the frame.
It's your call, and there are others here that could help you in picking a new hammer and/or grip safety, but my personal choice would be to change the hammer - unless you're insistent on having a spur hammer, all the filing and stoning will be internal and will not affect the frame.