Battle for Azeroth kinda threw all of Draenor in the trash just to justify brown orcs. This hurts me emotionally and needs to be fixed.
Rather than devoting a whole new expansion to it, I believe the lore can be salvaged with new starting experiences for playable Ogres, Naga, and Draenei/Orc Demon hunters.
The Ogre and Naga starting experiences would cover two halves of the same story.
Ogres
On the Ogre side, a civilization of Ogres living in Farahlon are panicking because every star in the sky suddenly went out at once. We’ll call them Skymaul for the pun.
For most Skymaul ogres, the stars disappearing is a is a sign of the end times, however for the Ogre Magi of Sky Maul it proves their existing theory that their universe is only a few decades old, and that Draenor and it’s surrounding space is all that exists.
Since Draenor and it’s surroundings came into being when the alternate timeline was solidified, those stars never actually existed. But the light from them was traveling dozens of Light-years of empty space providing the illusion of stars being their until the last of that light finally made it to Draenor.
After trying and failing to explain this to their single-headed brethren, the Magi began devising a plan to bring Draenor into the main timeline.
The Ogre starting experience follows the player as they help with the ritual to save the planet. The actual tasks you get are pretty much the same whether you’re playing a one-headed or two-headed Ogre, but if your playing a two-headed ogre you’ll get more in-depth explanations for why you’re doing what you’re doing.
This mostly consists of gathering reagents, clearing a ritual site, and working with emissaries from the Coilfang Naga, who are working in Outland towards the same goal.
Naga
In the main universe the Coilfang seek to put a stop to Outland’s ongoing destabilization. Hearing about Draenor from the Outland Draenei, they make contact with the Skymaul and work together on the spell to bring Draenor into the main universe.
Similar to the Ogres, players spend their experience preparing for the ritual. As the ritual effects all of Outland, the Coilfang cooperate with the Draenei to prepare for the ritual, and get invited to join the Alliance rather than continue being enemies after it’s completion.
Once the ritual succeeds Draenor is pulled into the main timeline, and Outland is pulled out of the Twisting Nether to join Draenor’s many moons in the upper atmosphere.
Demon Hunters
Draenei, Lightforged Draenei, Orc, and Mag’Har orc demon hunters come about when Lothraxion realizes an AU Xe’ra has made it into the main timeline.
Since Sire Denathrius died Lothraxion has been something of a free agent, a life he quite enjoys and wishes to maintain. AU Xe’ra threatens that, so he contacts the Illidari and informs them another Xe’ra has entered the timeline, and will almost certainly attempt to lightforge Illidan as the last one did.
The Illidari go to Draenor’s Shattrath and begin a quiet invasion. Using Fel to break Xe’ra’s control on the Lightbound, they create a new contingent of Demon Hunters who ultimately kill the Naaru goddess.
With Xe’ra gone, the Lightbound Empire falls into disarray. Yrel contacts Velen for answers to what exactly happened to her under Xe’ra and how a being of pure light like her could cause so much suffering. Velen offers his own advice as well as Alliance aid. A similar story unfolds with Exarch Hellscream and the Horde.