Need input from big cam users.
Back the total timing off to get rid of the detonation (pinging)...I would try 32° total.
If you are wanting a milder motor, you can replace the cam relatively inexpensively (~230 bucks for cam/lifters/gaskets)....and you don't have to pull the motor to do the cam swap.