I think Ororo should be more like Shuri's contemporary or even younger, and if we introduce her in BP2, just give her a premium cameo, not a full on role. Just enough to give us a vibe and a cool image or feat, to get people excited to know more about her. T'Challa can even give a look like 'Damn..." but then Nakia ribs him with an elbow and reminds him she's a teenager! And we follow her adventures off into the X-Men films/series at Prof Xavier's School.
As for your second idea, if we completely rewrite Forge into a good character, I'd be open to it. The MCU retreatment would allow for that sort of thing. If you made him younger, and a vet of Iraq or Afghanistan or whatever, and he's now working for DARPA or Halliburton or whatever(and mix in DARPA director Raven Darkholme in Captain Marvel), it could be a great story on film/D+ series. But like, slow and steady over a long time, especially if they weave whole series back into the main movies.