I think that the resolution needs to be bigger and more symbolic than just passing the burden to a new guardian, even if that person gets better terms of employment than Rumpel did. One of the recurring themes throughout the series has been that a big task is too much for one person to handle alone, and that friends and allies and even former enemies will insist on being part of the team to share the burden. To me, that’s such an uplifting theme that it deserves to be the moral of the Once Upon A Time fairy tale, and so I think that the role will go to all of Storybrooke.