If you have already built a motor with too much compression, i understand water injection systems work great at eliminating detonation Check into that.
Some heads really help reduce tendancys to detonate. Double quench chambers like magnum 5.9 heads need less timing, and can run well with more compression than other heads.