NickB,
You might want to consider a bigger turbine, turbine housing, or exhaust system. Backpressure is a big factor in detonation, and if you're getting 18 psi by 3000 rpm, you could probably handle a lazier turbo.
Obviously the exhaust will get the turbo to spool sooner, but is inline with...
