You are unusually wise for this forum! I agree in both cases.
Remember, Ororo was a leader among her peers in the den of child thieves as a child in Cairo(under Achmed's tutelage, of course), and she was a goddess to the people in the Great Rift Valley region, bringing rain and easing their burdens. Meanwhile Jean is getting her friend killed by throwing a firsbee into the road and Kitty is to busy being a spoiled brat to care about anyone else. Ororo was always the elder stateswoman, even as a child. In the fullness of time, I like Claremont's idea that Kitty would become a politician(and USA President), while Storm and Phoenix were more embroiled in superheroics(as seen in X-Men:The End), but we have also seen Storm as the leader of the United State of Africa in the future too(Earth X), and her powers make her a natural globalist humanitarian.
I agree it should have been Ororo making the move with Jean by her side, but I would have accepted them working together, too. It would be a better use for Ororo compared to being Kitty's servant in Gold.