I have to say that I loved the two of them together. 🙂 They were sweet and touching–I had been ready to go along with the theory that he had adandoned her because he was simply a horrible person. It was his way of protecting her, of course, but I am glad there is more to it than that.
Also, I don’t think I can picture Emma being with anybody but him–seriously, he was the one (the only one who was not family) that put her first because he loved her, and not because she was The Savior or because she had magic.
That said, I do think he might be Baelfire–August might have shown Neal a picture of Rumpelstiltskin’s dagger. He had one with him before.