I aggree with Geo Lander that a motor swap could be the way, but not sure about the reliability bit! we always try to stay away from all the electronics!!!
But in theary, it makes our current motors worthless in the future, unless we you can do a body swap!
As for Electric, not yet!