I’m not sure about Baelfire’s involvement. It seems kind of risky to put that into the curse as a failsafe, not knowing if he would ever be found. Regina seems pretty confident that enacting this failsafe is all up to her. It would be an amazing twist, though. These last remaining episodes are going to move super fast!