Electric Dilemma...
I'm sure you'd get better response if you posted in the Electrics Forums. This is 90% IC.
But I'd go with the 540 on your existing plane to start. You can probably get it in the air for $70 to $90 for ESC, simple charger and one Battery pack.
Keep in mind, you'll probably want AT LEAST two battery packs, three if you want to fly continuously.
Dennis-