Not really, I reckon he has moved past her death for the most part in the season finale. I think that he never really grieved for her and that twisted him slightly? Maybe that's a too strong a way of putting it, but she was his "world" his "happiness" but he spent so long trying to get revenge that he forgot her and now the only thing he can remember is how she died. And if she was his world then by forgetting her he lost himself. To sum up he can't just 'get over her' and I don't think he should but he's already come to terms with her death.

Unless I'm given more evidence, it didn't really seem like two way love. I know Killian loved her, but it didn't seem like she loved him as much. Yes she helped him get away from Hades but it was for Bae not Killian. She even said her unfinished business wasn't Killian. At least Emma is Killian's and she is his. Milah also seemed to care more about the next adventure. Like I said about her dying; Emma is much better for Killian than she ever was.