Characters like Tink, Dr. Whale, August or even Graham don’t really carry much gravitas to the current story anymore. We’ve already seen Peter Pan this season, so I don’t think he’s the one. Even though Emma and Neal already shared a scene in 5×12, we know Neal has a connection to the current story in the form of his family. Emma stated in 5×5 that Neal clearly loved the song called “Only You” and that it worked on her; given what we know about his apartment being in that episode, it makes sense that Henry might find a mixtape with that song on it. Neal and Henry sharing a scene like that would actually be a really good thing in my estimation because Henry never got to say a proper final farewell to his father. While it would be heart-wrenching to watch, I’d actually enjoy a scene like that with the two of them. I’d be more disappointed if Henry and Neal never got to have any real closure.
"That’s how you know you’ve really got a home. When you leave it, there’s this feeling that you can’t shake. You just miss it." Neal Cassidy