or my suggestion would be to just create 2 classes within the IBR competition:
Individual Rider
Team Rider
And delineate the specifics for allowable assistance in both cases, and adjust the rules year after year (as they are already doing) to keep the playing field fair and level.
My hats...