There is a bullet, blitz and classical time control but where is the rapid?
I'll be really happy if you can make a distinction between rapid and classical time control. My suggestion is something like this:
The lower bound for the new rapid time control is the same as it is now for the classical time control, and the upper bound for the rapid time control should be something like 20 + 10 sec/move. And everything above this 20+10 is the new classical time control.
Hope you can make this wish true :)