Easy fix: Limit combat resurrections. Give them a considerable cooldown so you can't just zombie your way through fights. There now people are actually punished for dying even if the content doesn't have an enrage.