Go with the Wind and switch to electric ASAP. You will not regret it. The Wind is a better model and electric is a better power source. Especially when you do get those better servos. They won't get beat to death by vibration from a banging 4-cycle. There is some stuff to learn to fly electric, but you've already seen that the YS is not foolproof either. Make the switch now and you'll never look back.