If I have to do it all over again, I would pick out my battery first from HobbyKing and see what it comes with and go with that. However, since Heng Long uses large Tamiya plug, there is always parts for it.
I am on large Tamiya, and have just about every connector converter from HobbyKing (Deans, HXT 4mm, XT-60 etc etc to Tamiya).
MichaelC.