Whenever Jean comes back, even though she sort of is, I kind of want her to be with someone who doesn't blandify her. I honestly feel like a lot of these Mary-Sue accusations are much more rooted in Wolverine and Cyke's adulation of Jean and obsession with her rather than her character. They were the ones who made her saintly, she's basically used for pathos for both of them so she's depicted as the "perfect woman".
Be that as it may, she still doesn't get to do a whole lot outside of that triangle and the Phoenix force and I wonder if she might be better of with someone who makes her more aggressive, who challenges her more. Somewhat like Scott had Emma, I think Jean needs NAMOR.
It's perfect, I think. She's very much his type, he likes the good girl type (Sue) and god knows he loves power in any capacity and NOW he's actually felt the Phoenix for real so they have that in common.