Killian (Possibly, because we were hinted that Emma has to learn to move on and let go)?
Except the end of 515 tells us otherwise. That entire episode was about whether Hook should move on or not, and ultimately he decided that he should return with Emma. I don’t imagine the writers going back on that. They’ve moved on from that question.