I think so. Next!
Type III: The Archangel of Mercy. Appearing as a winged old man in silver robes, this angel is most often found as a guide to those who walk in darkness, a protector of the weak, and a last-minute deliverer from the jaws of evil and death. At will this angel can Cure Serious Wounds, Cure Disease, Remove Curse, Part Water, Find the Path, create a Wall of Fire, Ice, Stone, Iron or Fog, Blade Barrier, Wind Walk, Mass Teleport (up to 10’ radius), and Continual Light, 15‘r.
The Archangel of Mercy is not affected by a Time Stop, and can only be hit by +2 magic weapons or better. He fights with a Sword of Sharpness. Magic resistance without the sword is 85%. Armor class -1, moves 15/30”, twelve dice.
BOZ and I pitched it as...
Angel, Merciful (or Angel of Mercy) (Outsider, CR 15)
Appearing as a winged old man in silver robes, this angel is most often found as a guide to those who walk in darkness, a protector of the weak, and a last-minute deliverer from the jaws of evil and death. It wields a +4 merciful longsword. In addition to the usual angel abilities, an angel of mercy can choose to deal nonlethal damage with any of its spells or spell-like abilities. It casts spells as a 14th-level cleric.