I see your point Phee, but here’s another possibility. Let’s say that Rumple and Zelena have been together for a year. Let’s speculate that something has happened to Bae in the missing year in enchanted forest. Let’s say Bae’s life is in danger. That unless Rumpel intercedes in some way Bae will be killed or taken to a new land where he will never find happiness.
Wouldn’t Rumple move worlds to find a way to get Neal out of EF and bring him to a safe place, storybrooke?
Possibly Rumple is working not to free himself, but to free Bae.