Also if I continue to think that with proper training in altirude effects of EPO can't produce any improvement, about the general problem of doping I agree with the most part of what you write.
For example, one resolution that can produce good results could be to cancel ALL the results of doped athletes, from the beginning of their career, and to allow them to start competing again only after giving back the amount of official prizes they were able to win.
I absolutely don't think doping has to provoke the ban of a Country, looking at the number of doped, if there is not the "official" intervention of the State in the organization (like was in Russia, and in the past in ALL the Countries of the Sovietic block : East Germany, Czechoslovakia, Bulgaria, Romania and Hungaria, where doping was directly organized by the Federations, while Poland didn't have the same organization).
There is a big difference between the two systems : the main benefitter of the Statal Doping is the State, while, as in the case of Kenya, in individual doping the benefitter is the athlete, and maybe some private organization (doctors and managers).
But it's absolutely necessary to make something different, and to accept the idea that "doping" doesn't mean anything, and the substances have different impact of the performances.
For example, 3-4 years of assumption of steroids can give a base of muscle strength that can remain for all the athletics life, while taking EPO can give advantage (for "responders" not using altitude training with the right intensity) for short time only during the period of cheating, prolonged of some month only after finishing the assumption. For those reasons, to give the same period of ban in these two cases is wrong.
I'm for giving a "first step" ban lasting two years for all the athletes using systems "against the ethic of sport", considering a wide list of substances that can produce improvement of various levels in the performances (from nothing at all, till big improvements), but in any case are taken with the clear goal to have some external aid. In this list, it's possible to put also the most part of supplements, because franly I don't see any moral difference between athletes taking steroids (illegal) or taking creatine (legal), if their goal is the same.
After this first step, we need to have different periods of ban, depending on the substance, and in this case we need to have very precise proves of the benefit on the performance, something that 80% of the substances in the lists at the moment don't have.
Results are speaking : without steroids, we didn't have any WR in throwing (and also sprint and jumps for women, and jumps for men) in the last 32 years ; instead, in long distances there are new records every year, and this means that the effects of EPO are very small, or 95% of top athletes are so clever to overtake OOC tests, in spite to live in Countries where the medical organization is at lower level comparing with Countries that continue to have a lot of athletes caught for some mistake, also with good medical organization in their management.