The olympics these days have so many “diversified” sports these days, perhaps they are taking the wrong approach to this.
I’d suggest they setup a new Sport of Doping. Have athletes compete in this. They could be creative in how they exhibit their doping results. Judges would do the usual in response, holding up a placard with their number - 1 to 10.
This way, doping would be contained - if you want to excel in it, you have an outlet. The non-dopers would play in all the other sports.