Careful A>B testing may show you a point where you have knock entirely due to water temp. Sometimes it's easier to upgrade the cooling system than re-tune the engine.