X is totally good enough, heaven knows they had enough chemistry in Paris.
But again there's the whole weird sister vibe, depending on whose writing them. Majorie Liu was reliving her old Annie fan fic days in those issues.
But I think in the end your right and X is the best choice.
Just thought of something crazy: Jubes and Daken maybe?