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.
I prefer the EF coming to SB rather than everyone getting transported back. Isn’t everyone getting back to the EF endgame for the series? It’s a little too soon for them to get to go back home. I kind of pictured them all getting back there at the end of the series to rebuild/take back everything. I’m really hoping they don’t all get transported back.
And it’s true, they may just arrive back in SB at the very end of 310.