That being said, the idea of Emma being reborn as a more powerful savior really is what got me on board with this theory. I think Emma has so much more potential than she knows.
Yes I agree. Her full power of Savior hasn’t been fully realized yet. I’ve always believed that it will be Emma’s job (her real job) to take everyone home to the EF. It also fits very nicely with the Christian motif running through this thread—Christ’s second coming result in the “going home” to the mythical/heavenly realm. Emma’s being reborn or being rewritten into the story (say, by Henry) grants her the ability to take everyone back to the Fairy Tale World which has always been the more mythical/fantastical/divine realm as compared to the human world of SB.