I suspect that you have an intake tract leak somewhere. You IAM is reduced to 13 and should be 16 and your still getting knock. If you have romraider can you use the Learning View utility and get a screenshot of the stored fuel trims and FLKC?
If you don't have the tool let me know and I'll find you the download link.
download at the bottom of first post.