http://www.hobbypartz.com/car.html

This combo is proven to be a solid performer. This will be quite a bit faster than stock without breaking things, and it should have runtime similar to stock or better. Plus it has the tuning card which allows you to adjust the motors power to your liking. The only downside is that you will need to change your battery connectors to Deans or Traxxas plugs.