EeveeA suggested something I liked. Earn your resurrects - when you participate in a fight and heal, or damage boost, you earn energy (like Torb’s scrap). With enough, you can resurrect rather than have it on a 30 second static cooldown. This prevents Mercy from resurrecting a really hard-to-pull-off kill from far away, or walking back from spawn and being able to do it again.