Yeah, Rumple being there because he chose to (to help Henry) sounds better than him being separated from his family against his will for the 100th time.
They also just confirmed that Emilie will return at least for one episode (7x04), so hopefully we'll see some Rumbelle/Gold family as well, and get some cute filming spoilers/pics
