Anyhoodle, based on this clip from io9, may I suggest SpookyDan as her replacement?
You're pretty great Puppet!Edward, but it's still Angel for the win.
And just because it makes me giggle:
Evil's still afoot! And I'm almost out of that Nancy-boy hair-gel that I like so much. Quickly, to the Angelmobile. Away!