Ok, I said it about 200 pages ago, but it bears repeating. Unless the writers have ZERO sense on continuity, Neil and Bae cannot be the same person.
Rumpelstiltskin was already The Dark One when we first meet Jiminey in human form. At that time, Geppetto was only a child. So unless the magic bean made a time portal as well as a realm-jumping portal, Bae has to be at least in his 60's (aging compared to Geppetto)
There's already continuity issues. Per the "official" Rumple wiki description, he was 300 years old when the curse happened, (presumably because of becoming the Dark One?) however in that case Bae would be long dead of old age in this world.
Even not accounting for Rumple's presumed advanced age, you have the timeline of events involving Hook and Bae's mother. Since Rumple didn't get involved with Jiminy/Geppetto until after he became the Dark One and Hook was involved with Rumple before he became the Dark One, Hook should be about 90 years old. My guess is that they will cover any continuity issues with a general "time is different from one world to the next" After all, we already know that time stood still in Storybrooke for everyone other than Henry.