How about just making hirelings champions?
Also, any consideration to making all NPCs that we have to protect (Heyton, Coyle, etc...) champions? They suffer the same as hirelings do, except instead of a probable fail when hirelings die, it's an actual fail when the NPC dies. So if it's an issue with hirelings, it's a full-blown problem with NPCs.