Nah, from the moment Doc started shooting up, I knew his time was limited. Plus as I said, I don't think they'd remove One just to replace him with another, fairly similar dude.
However subbing in another "Strong Kickass Female" is basically par for the course these days XD.