Need recommendation for E maxx

Ok;
I have just discovered there is an indoor track right down the road from me. I am intrested in starting to race.

I have an E maxx (stock) and a stampede (novak 5800 brushless).

I have pretty much just been a basher. It seems pretty apparent that the pede is not that good for racing but the E maxx should do ok.

I would like to get a brushless system that is pretty competetive with the T maxx.

I am not looking for CRAZY power just want to be the same as the T maxx's.

What would you recommend. I really like the fact that I can get the novak stuff at my LHS. Would the HV be close to the T maxx?

Thanks for the support.
Dan