CSR Category change?

I find that CSR is generally okay. I mean it could be worse and it could be better, but overall I like it.

However one thing I would change is perhaps the categories. As most of us know CSR is separated by both individual performance rank and win rate/team scoring rank. I feel that some playlists are in the wrong category.

Here are the current Categories.

Individual performance:
Infinity Slayer
Big Team Infinity Slayer
Rumble Pit
Multi-Team
Team Action Sack
Flood
Team Snipers
Regicide
SWAT

Team scoring:
Castle Team DLC
Team Objective
Capture the Flag
Dominion
Team Throwdown
Team Doubles
Grifball

Here is what I feel the playlist separation should be

Individual performance:
Big Team Infinity Slayer
Rumble Pit
Multi-Team
Team Action Sack
Flood
Regicide
Castle Team DLC
Dominion

Team Scoring:
Infinity Slayer
Team Snipers
SWAT
Team Objective
Capture the Flag
Team Throwdown
Team Doubles
Grifball

This is only my opinion, what do you guys think? Maybe list what Category you would do?