Power Ups whilst Racing

Whilst there are lots of discussions on the use of power ups, for and against them, I feel there needs to be a change on the use of them during races, to make it fair for all racers. Could all riders not start with a set amount of power ups each all the same, using them whenever and where ever you please, making this a more tactical and fair game/ride? Maybe even changing the power ups altogether for races to say, two gels each at the start that could be a similar effect to say the aero helmet, to be able to use them at your choice? Any thoughts?