Swapping plugs is not going to get rid of 7* of knock.

Ever.

Sounds like that thing needs some better wires, headers, and a solid tune.