ahh ok, Due to the gearing in the HB and CP generaly need a motor up in the 3500 to 4000KV range.
I would stick with upgrading to a Esky 3800 or 3900 motor with at least a NON Esky ESC of about 35A or more. Ether one will cost about 60$ total to install with a new pinion gear. One (3900) is a drop in and the other is needs a minor alteration to drop in.