Sounds like your ready for the GWS Tigermoth 400. A good updatable plane
Flies good with the existing setup but will work better with a Himax 2025 -4200 motor. Good update also is a Triton charger, which is very versatile. Thunder Power 2100 ma lipo batt. Tkis power system can be used in many planes. I have the same system in a GWS Zero which a little hotter. If you have a confined space the TM 400 would be the better of the two. The TP 2100 batt will cruise around for 1/2 hr on a charge. Hope this helps.