They can leave Bishop and Jean in the past cause that entire storyline was, “black man gets thrown in prison for sleeping with a white woman, while nothing happens to her.”

I think they can stick to the poly thing (and maybe explain it someday) or just let her be single. At the bare minimum she should be allowed to be on a team without Scott or Logan.