RE: prop suggestion?
try a 8x10 prop. You can mod the engine but otherwise you shouldn't be looking at top rpm but top hp, beyond that torque decreases too quick (i.e. high rpm only achieved with a small prop) and you're better off swinging a prop with higher pitch at lower rpm.
Clement