I think the Shalka should be treated as an ambiguous Doctor too, since he was treated as an official incarnation by the BBC before the revival.
