Stopping the knock: Lower compression and ported heads...

No doubt

And yes-reverify the cam...maybe even retard it a couple or few degrees...

i agree re degree the cam. now to be fair to the OP you should add only in reference to the lobe centerline, not what the gears say as they are known to be all over the place...

Op degree is as it sits so we know where it is, then we can go from there