First .......You are underpowered.
second.....I suggest you check your cg...........
Third......I would investigate the throws on you control surfaces.

Less power requires more movement for elevator.......take-off roll should not be so long you pucker up....

Your plane is heavy......More power is the answer...but CG will be the most important thing you change.
When you change engines.......check your cg...
Doc