Help me chose a brushless setup for my Losi XXX-T

[hyperasus]

I am not looking for outrageous power. I want something that’s a little more power then stock but with much better run times. Power is great but run times are the most important to me. I am thinking I will probably go with a 6000 or 8000mha 2 cell Lipo battery. Which controller and motor would work best for what I need? It can get pretty hot where I live in the summer. So between the summer heat and those extra long run times I will need something that runs as cool and efficient as possible.

Also, if I can I would like to have the ability to run a typical 6 or 7 cell NiMh battery as well as the 2 cell Lipo. If this makes things complicated then I will just stick with Lipo battery only.