There is no feasible way to "end" doping. It won't happen. If nothing else, there will always be some domestique working his butt off in training, slamming his head against his genetic ceiling, and still needing some help to hang on to the back of the peloton just to keep his job, like the AG2R guy who was busted for EPO recently.

I'm a big believer that the biggest thing that needs to happen, and the only thing that will really make things better, is to have a paradigm shift in how doping is reacted to, within the peloton, amongst the riders themselves, when nobody else is looking, even if the tests can be beat.