There should be a button to lock draft, so that regardless of how much power you put out, you cannot move past the rider you are drafting (although of course you can drop back if not putting out enough power).

This would allow for proper lead outs and team time trial formations. Currently these are very difficult, if not impossible, to execute.