Bake the +heal into defiance, increase it to 25%, turn Inner Beast into a shield (Or a heal that heals for a % of the damage you took in the last X seconds)

Done, warriors fixed (probably!)