Both in my opinion, but Dany first. I don't think she will kill Dany yet, just cross paths with her. I think it's too early to kill Dany off. On the other hand, Aegon is doomed one way or another. Mother Merciless will have a dose of Mercy, not the other way around.