RE: Your thoughts on new plane and engine......
Sounds to me like you've just about got it all worked out. Your servo selection is excellent. However, you might want to consider running them on six volts, (5 cells) if you're using all digital servos. Digitals drawa little more current than analog. Good luck with your project. You'll love the Edge 540T.