Race trim for most quickies has the CG at around 2 3/4" to 3" from the leading edge. This depends upon the airfoil used and pilot preference. So to tame it down and make it more controllable:

move the CG to 2 1/4 to 2 1/2" range
increase the elevator throw
use some expo if your radio can do it
set up with dual rates if you can
have an experenced pilot test fly

And I would keep the 40 on it, when powered by 25 sized engines they have difficultly getting off the ground if the wind is gusty