Yes to removing it from the 60s roulette and putting it on the main scenario roulette.

As for the number of current roulettes, they seem about right. Expert, Level 60, Level 50, Leveling, Trials, Main Scenario. This seem to cover all the bases.