We absolutely must talk about the next set, to be titled Secret Wonders. It not only has a new Electivire, but the new Electivire will be in one of the new booster decks. If you haven't seen it yet, make haste to http://www.pokebeach.com/
You are right .... Its a combination of Magneton PK and Flygon d HP all in one. Except for the weaknes and resistence thing.