this is the WWE, man.....you typed too much logic....
I agree, WWE doesn't care about all this depth and backstory.
If they were going to do it, they've already missed their window to put Naomi in the storyline.
They could've did something with Street Profits/Bianca and The Usos/Naomi.
But they're doing a draft like next month and they absolutely have to shake shit up because they've done EVERYTHING to death.
And either they're gonna do Bianca/Sasha to death, or keep them apart to make the 3rd match the big match down the line and send Sasha to Raw, which would probably mean they'd send Charlotte to Smackdown (to keep her away from Becky), and then do Bianca/Charlotte to death. And I don't think Naomi fits into either of those scenarios.
So I don't think they're gonna do it.