Oh my god...an idea popped in my head.
What if during the battle of Helms deep, Maleficent comes out for a bit...and she's the reason/or the person that kills Haldir? I mean....that'd set Yavanna more off than anything, in the moment.