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

If you do, do it before you put the heads back on it.

No doubt

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