For the all female team movie...
Have the line up be...
> Captain Marvel> Valkyrie or Sif> Scarlet Witch> Wasp> Nebula> ShuriNo Okoye, Valkyrie makes her redundant.
No Widow she is getting he own film & we have gotten plenty of her in previous team films & Nebula makes her redundant.
If Gamora returns from the dead & is used, she has this outfit, yes including the starfield at all times -
http://4.bp.blogspot.com/-xkcxTNGWLGA/VPL19LZq7QI/AAAAAAAARAk/ZiXHuQUrN-A/s1600/black2.jpgFor Valkyrie's outfit. Give blonde hair. Go back go her black outfit but take the gold breast plates off this & place onto it -
https://static.tumblr.com/9a6ff02a33e28e38296e6a34ce2c94f3/wq27l7k/EKmp5i34g/tumblr_static_f46k1glvctcg4w0s8s48wkwgo_640_v2.gifDon't address it being a all female group.
Have them encounter different pieces of the big picture separately & come together like the cast in Infinity War did.
Like Shuri is visiting the remnants of Asgard & teams with Valkyrie. Captain Marvel teams with Nebula in space & such.
Not sure about a villain, don't want Amora unless she is properly sexualized which they won't do. And if faithful to the comics she will pale compared to Hela & she won't be a match for this Captain Marvel.