M30 Broom Firing Pin Pbms

[TomIAm]

I just bought a M-30 Broom, which a previous owner has had relined and chambered to .38 ACP (Note NOT .380 ACP)! I replaced the recoil and main spring with a Wolff kit and cleaned and lubed it. I noticed that the forward portion of the firing pin was slightly bent, so I carefully tapped it straight, and reassembled the weapon with the old firing pin spring. I pulled the bullets from a box of .38 Super ammo (exact same dimensions as a .38 ACP, but much hotter load), and reloaded the cases with 5.1 gr of Unique under a 115 gr Montana Gold JRN at an OAL of 1.260 in. So far, so good.
It shot OK, but jammed often, due I think, to a worn extractor. While the primers were only slightly flattened, they did have a very large dent in them, far deeper than it should be (they were not blown through, nor was there any sign of leakage around the primer). The firing pin also bent again slightly.
So, will someone please tell me how to properly fit a firing pin spring? How far should the pin protrude when pressed forward? The original spring seems to have been filed where it screws onto the firing pin, that is, the cross-section of the spring wire for the first 1/8 inch or so isn't round, it's been slightly flattened. Is that correct? Should I just shorten the firing pin? HELP!