I don’t think Rumpelstiltskin would have gotten far running a second time. He would have been caught again, and possible killed for it. The Knight was obviously cruel–he would have enjoyed killing, or at least torturing him.
I had forgotten about magic coming back–now Emma will truly have no choice, not unless she either is able to get out of it, or if the task is not too dark. Even if Emma is forced, she might be able to find a loophole–Rumpelstiltskin did it himself with his deal with Regina when he promised something tragic would happen to Kathryn.
Concerning the Blue Fairy, I don’t think she will have much power. Rumpelstiltskin does not like them, and since their magic does not react well with his, he will probably do what he can to make sure they have little to no power, and since he made the curse and the True Love potion, it might not be too hard.