Would you be interested in selling your old truck? The 2.5 is a pretty strong engine when it's tuned correctly, my 2.5 will pull wheelstands all day long if you want and it's got decent top end. Keep in mind this is with stock gearing, so I could go either way with the gears to adjust to my liking. If I were you, I would run the 2.5 for a while and then when you wear it out you could consider upgrading. The engine not idling sounds like a tuning issue, but I'm still kinda new so I think you need to wait and see what a veteran says. When you decide to upgrade, you could go with a 3.3 from traxxas, and OS makes an OS 18 tm that will drop in, and an OS 21 tm that will also drop in. The 21 tm has big block power, and you will have to replace the entire drivetrain to handle that much power. The OS 18 tm is a much better option in my idea because It's got about the same amount of power as the 3.3 but most people say they are much easier to tune and last longer. The only problem is that OS just cut production on the OS 18 tm because of the os 21 tm, but I would think that someone will come out with something similar to catch that part of the market, and you will still be able to find them on ebay. Another option would be to send your 2.5 engine to someone like ABMods once it gets some wear on it. You will have to wait and see what the veterans say about how much power can be gained from a mod engine. If I were you, I would put RPM A-Arms on my truck ASAP. They have been great, ist amazing how strong they are, and they really make the truck a lot more dependable, and they also drastically improved my handling. It made it drive and handle like a different truck, and that was just using the stock settings, no telling how good it will handle once I tune the suspension. I think two of the most important mods are a good screw kit (because the traxxas stock screw heads strip out quickly) and the RPM A-Arms. I hope this helps some, I've only been running my T-Maxx for about 3 months, and I'm no veteran, this is just what I've learned from my experience in driving and upgrading my truck.