RE: motor recommendation
if you want a bit more performance, get the graupner 480bb Race.
reasonably priced...great performance!
It depends what speed control you're using - the motors you have are brushed, correct?
going brushless may be a little more expensive, but I'd only go brushless if you want "speed monster".