First of all, DITCH THE STOCK SHOCKS!!! They suck bigtime...the plastic bodies just do nothing to help performance. Second, throw AWAY the stock 2055 steering servo. That is another weak point of the truck. On the T-Maxx, you can move the 2055 over to the throttle and throw out the 2018 servo.
Modena - Tip: Remove the 2-speed servo and all it's related parts. Push the '2-speed lever' -IN- and install a screw into the chassis to keep it in 2nd gear. Now, install faster motors and re-gear the truck slightly for the taller gearset.
I did this on mine (of course, I'm running 2 8x2 TI motors). You will STILL have TONS of accelleration (my truck just flips itself over if I pin it from a standstill) and still have the top end (since you will be using the 2nd speed gearset). Best of both worlds.