I actually like the idea of keeping 8 teams, but making there be roster requirements.
Make it so that each team has to to have 7 spots (really 8 people) with a minimum of 2 KOs/Divas on each team and 1 tag team (would count for 1 spot).
Ex:
1. Cena
2. Kofi
3. Kaval
4. Chavo
5. Santino and...