Not definitive. If it’s Neal then it seems morel likely he’ll show up at some point in 522 (Only You). If it’s someone like Tink, August, Jefferson, Graham, Dr Whale then it just depends on what their role is but those characters aren’t weighty enough for it to be “final scene” sort of revelation. If it’s a former villain like Peter Pan, then I’d say he would show up at the end of the episode for shock value.
[adrotate group="5"]
"He was a lot of things to me" "The only conclusion was love"