I think too that Emma, Henry and Regina is the most important triangle. It has to be awful for Henry to not have both mothers, because Regina want him alone and now start to fight. I hope it is only a trick and she will turn against her mother to protect the people Henry love. That would really redeem her and she will be really the mother of the year (not like Cora).
But if Neal is Bae and he come to Storybrook. It would be really interesting their first talk. I mean she is the person, who look after Henry until he was ten. She is the person his father manipulated her to be the evil queen. She is the person that would be Bae if he stayed by his father. It is really interesting how they both are connected without even knowing each other.
Heros don't get their Happy Ending!