RE: I have a dilema that needs some help please...
Switch 'em. I had one airframe that I swapped out with four engines until I got the right marriage. Part of the fun of R/C is experimenting with the configurations. Like you already seem to be doing I swap props in incremental steps to see what it does for the handling and performance.
It's like tailoring a suit to fit you. A particular engine may fit a plane, but they both have to fit your moods and techniques.