Let’s face it, the way he was written, he was suppose to annoy us. He is not Charming yet. He has to remember how to be Charming before he can be Charming again. Just like he got Angry Snow to become Snow White again. Emma, I think has to start talking to him as friends rather than just siding with Mary Margaret all the time. She is the key. Other than Graham so far he is closer than anyone else to discovering who he actually is. I believe you will see David / Charming and not just James / Charming sooner than we think.