Upgrading my Volcano EXP
 

After hours of research on this forum, I feel confident that I've made good choices on upgrading my Volcano EXP motor, however, I'm not entirely sure about the batteries. I am wanting to switch to LiPo due to more power and runtime. It'll be my first LiPo system, so I'm trying to figure out what all I'll need in excess of a battery and charger. Below is what I'm guessing I will need, and the motor/ESC I am wanting to get as well. Any advice on the subject would be greatly appreciated.

Thanks!

Motor/ESC combo:
http://www.nitrorcx.com/ezrun-brushl...--60a-esc.html

Pinion:
http://www.nitrorcx.com/16p-11170.html

Sky Lipo 4000mAh 7.4v Battery:
http://www.nitrorcx.com/77p-sl4000-2...hc-bullet.html

LiPo Charger:
http://www.nitrorcx.com/26p-e4-charger-ii.html

That is all you need,

I've had this system for about 3 weeks now, and have run a whopping 1 1/2 battery packs through it. It absolutely flys, and I'm extremely happy with it. My only concern is that it is now sounding like something is grinding/clicking in the motor. Is this normal sound for brushless?

E.g. when I'm barely giving it any throttle, it'll grind/click, and twitch, and not go anywhere. E.g.2. At full speed and making a sharp turn, I can hear it click.

I'm just worried I might be stripping something out, or worse, over heating the motor..

Also, the only reason for so few runs is because I broke the hub carrier and haven't replaced it yet. Aluminum ones are in the mail.