Since you have you tried different ammo, it is an issue of the hammer not impacting the firing pin hard enough to ignite the primer. You've already put in a lighter firing pin return spring. I don't have a lot of knowledge on the CMC trigger, but if you can get the hammer spring out, you can try to reverse bend the spring, so it produces more pressure on the hammer, which might eliminate the light hits. A stronger hammer spring will slightly increase the trigger pull weight, more friction pressure between the sear and hammer.
"hammer riding bolt to lockup" should not be the issue unless the hammer is out of whack with the disconnector. Easy to test, pull the trigger and hold back. Charge the bolt. Slowly release the trigger and if it resets with hardly any forward trigger movement, it may be a poorly timed disconnector. If you have a hard time seeing how far the trigger moves to reset, put a screwdriver or similar between the back of the trigger and the lower. Keep a little rearward pressure on the trigger, with your finger, and apply forward force on the trigger with the screwdriver. You should be able to slowly move the trigger forward and see how much movement it takes to get the reset. Should be 1/16 inch or more.
Bob