There are LOTS of options out there, perhaps a pertinent question migh be; how much do you want to spend?

Because bigger fly's better.....

But the price tag starts going up dramatically when you move up size wise. You say that you "may need a new motor and that's fine" but don't say how big or how much you'd like to spend.

I would suggest that you first decide based on your wallet, radio capabilities (i.e. bigger models usually have dual elevator servos and some mid range radios don't support that so other methods/solutions must be found) and where you want to go?

As I said there are lots of options, but generally speaking as you start getting into some bigger stuff and want an aerobatic model the Yaks/Edges/Extras from various manufacturers are the way most folks go.