Glad you got a positive outcome.
If you are still looking at options the Pletty 30 10 Evo can not be beaten.
It is the most powerful motor under 600g, is very high quality and has no gearbox maintenance.It's ultra reliable,so much so it's probably the best value for money when all is said and done.We have two with 400+ flights and one with 600+ flights and they are all still as new with no servicing at all.
It's best point for me is it's sound in the air. Its sweeeeet.

Brian