Start by tightening the idle map around 3000 RPM, smooth the throttle curve, trim the deadband, and set fuel trim for altitude; then bump the boost line at 3500 RPM, keep spark timing conservative to avoid knock, and finally fine‑tune the ignition map against a dyno readout.

Good plan, keep the knock sensor data tight, tweak spark until the knock threshold is just below the safe limit, then lock in. That’s the cleanest way to confirm the timing is solid.