Run to your nearest dyno and get a custom chip..by someone who knows what they are doing..properly tuned you will not get detonation if your f/a is set and fulel pressure is 35 psi. An aftcl will help , but is not the answer to your detonation...I blew a motor on a mail order chip!
