And id take a different trade off.
In fact here are the things I’d do
Remove her self healing/lower it, make her primary healing beam more like moiras secondary fire, increase cooldown of ga, remove infinite ammo from valkyrie, reduce flight speed and duration,
and then buff Mercy by having one single target instant resurrect every 30 seconds. The 30 seconds I see as enough of a trade off.
Baptiste gets to have IF on a 20 second cooldown that not only protect him but also his teammates while not requiring him to be stunned without any way to cancel it, along with the drone having as much hp as mercy but without a critical hitbox and the cooldown starting as soon as it is deployed meaning he can potentially have a 12 second cooldown on it with 6 seconds of uptime.
Make her heals less consistent and have some sort of aim required like a beam, and the rest of the stuff i mentioned I think is more than enough so that her “iconic” ability is retained.
Fact is that what the developers said they wanted to do with the rework was not done.
Mercy is still incentivized to hide to resurrect, and she does not have an extra ability to use in combat. SHe has an ultimate on a cooldown that required several nerfs even with a 30 second cooldown (mainly because they thought it was a good idea to make it have a reduced and refreshed cooldown with valk).
WIth her mobility being much more depictive of Mercy, having to sacrifice it for resurrect is a bit flawed imo.
I dont think they should revert her by any means but if its a trade off you want ill gladly give up all the things i mentioned and more.
Though in all honesty I think they should remove resurrect altogether.
I’m going on a bit of a tangent but if you want to read a long-drawn out opinion on what I think you are more than welcome to read it here (though you probably wont)
https://us.forums.blizzard.com/en/overwatch/t/yet-another-mercy-thread/355676