Not necessarily. The JR6 may not arrive in Storybrooke until the very end of 310. 311 could be them readjusting to life back in Storybrooke, it could also focus on what happens to Pan, it could be about Henry after his Neverland experience? I still think the new curse will be bringing the EF to STorybrooke rather than the other way around.