You forgot the most impotant Hop up : Kanzen ceramic diff balls.
Indeed, use the AE springs. Somehow they're a better fit for the TRF shocks then the Tamiya springs
You should also consider replacing the kit ball cups. I'm using RPM cups and Schumacher ball studs.