I've been waiting for the Snow/Charming confrontation with Neal too but they really haven't had many chances to just sit down yet so maybe that's still coming. I did enjoy when Charming came out to Neal and Emma's conversation in Gold's shop, gave Neal the evil eye, and asked Emma if she was all right. Papa Charming is definitely the protective type so I think those scenes could still be coming. I hope so anyway!
Now that it's a few days later, I am HARDCORE BUMMED that August never apologized to Emma for helping screw up the only time in her life that she was happy. He really did owe her at least that and now there's no chance for us to see that scene. That's the one thing I was really wanting to see this season. Darn it!