Is your EGR still active? I tuned an '05 NA and kept getting part-throttle knock even with 0* of timing where the factory had 20-25*. I disabled the EGR and all that went away.