Ray,
I concur with Crashcrash and Barrrick on the HBK2. Crashcrash mentioned to upgrade to a brushless motor, he's 100% right on that. The stock brushed motors are el-junko...
Also, Crashcrash mentioned a 3800kv motor, the only problem with that particular motor is that it is larger in diameter than the 3900Kv and won't fit in the motor tray of the main frame without modifications to the main frame or a spacing washer is needed. I'd recommend what Jags has to offer with the 3900Kv.. That's what I'm using now and you get plenty of power.
However, Jaghobbies does have an upgraded HBK2 RTF with the brushless and ESC...
Also, Jags, carries all the spare things and upgraded CNC stuff, batteries, etc.. Like one stop shopping, been using Jags for sometime and thrilled with the 3 day shipping. He charges 15 bucks for shipping of a Helicopter. And only 3 bucks for parts ordering, regardless of how many parts, batteries etc. Jim is a straight up kinda guy.
See this page of his site, for 199 plus the 15 shipping, you're good to go.. Oh, BTW, the HBK2 is one of my all time favorites.
Page down and see all the parts and neat stuff too.
http://www.jaghobbies.com/rc_planes/ek1h-e016a_cart.htm
Dave / Choppersrule