Did Connor get his memories back?

[Ripper666]

In the episode "Origin" the glas with the memories of the dimension-change broke. As a consequence every human should be able to remember Connor (if he ever met him). The spell which should open Connor a normal life disappeared. But after I watched the episode I didn't get the impression than Connor remebered which was mysterious because Wesley did. So my question is: Did Connor get his memories back and if yes, was his decision to leave his dad right?

 

[white avenger]

Connor did definitely regain all of his memory, otherwise ha wouldn't have been able to defeat Sahjahn. His final line of the episode, "You do whatever you can to protect your family. I learned that from my father," was his assuring Angel that he finally understood why Angel had done what he had done. Later, in "Not Fade Away," he actually tells Angel that he knows what really had happened, and that is the only reason that he showed up at Wolfram & Hart to help fight Hamilton.