Nick, most commonly detonation occurs around peak TQ, so from that point on there is no problem to add 1-2 deg of advance. Pick VE also occurs at peak TQ

. A good tuned map would have the ignition rising to just around peak TQ than it would dip at peak TQ and then rise again as the rpms rise .
P.S. best way to tune is using a steady state dyno .