Idea to help fix Warriors and add extra utility to Warrior skills/Wrath mechanics

I'll skip the preamble, since we're all already aware that WAR is a woefully inadequate class with a pile of issues, and get straight to the proposals:

1. Increase the amount of Wrath stacks that can be accrued to 10, while keeping the same stat bonuses for each stack (So we'd see a healing buff of 30% and a crit buff of 20% while under max stacks), and apply the healing bonus to all heals. Skills that generate Wrath would generate varying amounts of it (for example, Heavy Swing would only generate 1 stack, while a skill like Butcher's Block could generate 3).

2. Skills that cost wrath would cost varying amounts.

3. The loss of Wrath stacks (generally through skill usage, obviously) would result in a self-casting, enmity generating heal. The amount healed would be dependent upon the amount of stacks removed (this amount would also be affected by the amount of stacks remaining).
(alternatively, make this an ablative shield or temporary damage mitigation bonus)

4. Improve Wrath-based skills so as to encourage more consistent use of them (rather than just using Inner Beast every time Infuriate refreshes) (Possibly change the function of Infuriate entirely?).

Although these changes would not entirely fix the Warrior (our cooldowns are largely the worst in the game, and even with these listed alterations, our cooldown abilities need some serious buffs), they would help to not only make the job more viable, but also more dynamic. Wrath becomes a more interesting resource to manage, as it comes with both passive and active bonuses, and the act of using wrath based skills ends up becoming more deliberate to compensate.