RE: Conversion for a .61 2S?
You are definitely going to want to go with an outrunner. More power and torque for the heavier planes, and just plain easier to deal with.
Here are some other options to look at:
Great Planes RimFire 42-60-600
HiMax HC5018-530
Axi 4120-18
E-Flite Power 46