You guys also have to acknowledge the lack of Tamara in that birthday scene. I don’t think it is a dream
Neil will eventually catch on to Tamara and what she is doing. By the middle of 2×19 or in 2×20 it wouldn’t surprise me if Rumple & Neil both figure out what she’s up to because I think that would set up for 2×21 & 2×22
Neal is still thinking he is marrying Tamara as of Episode 21 (the one I saw being filmed). He shouts to Rumple, “We’re getting married.” And Rumple replies, “Not if you’re still carrying a torch for Emma.” The reason we could hear it is because they were yelling!