The rule as it is now, gives a huge advantage to the captain...

The rule as it is now, gives a huge advantage to the captain inning the toss. So, I think, they (ICC) should continue with it and allow the team to pick their super sub after the toss.