True compressor surge only happens under acceleration.
You say its stock and the wastegate quietened it down so maybe the wastegate diaphragm is leaking or the spring has gone weak. I'd start by putting on a new actuator and hp from there.

EDIT: a manual boost controller won't do a great job at controlling boost spikes.
An ebc will though.