Get rid of the plastic pieces on the motor and prop shaft and replace the stock rubber connector with a real one, something with set screws. How many cells is your motor rated for? If you can, drop the cell count and see if that improves driveablility.