I would back that idea for the top 5 but would keep the reserves as they are.
Basically what does a team manager do now? A few years ago he had to pick the team, decide gate positions for his riders in every heat and decide when and where to use his old style tactical sub. In other words, had to use some skill.
Nowadays it's almost Team Manage by numbers.