Jon Hanke suggests the character of the Stalker. The stalker would have both the power of the angel and the vigilante, but only be able to use one at a time.