Another issue that may be contributing to your problem is with this larger engine you may have too much pull at idle. To compensate you are having to increase your AOA to get on the inside of the lift/drag curve to compensate for the excess thrust. There could be a very fine line between enough drag and enough lift that you are on the ragged edge on landing. You might think about trying a larger diameter prop with lower pitch, or a three blade with lower pitch.