I would first check for proper engine thrust line. If it's set up with a positive incidence, it will cause the plane to climb more as you increase the rpm's. If the engine incidence is OK, then go for the wing incidence.