I think changing the crit chance to a % damage boost is a very elegant solution to much of what is wrong with Rage.
The restriction of the ability to only work on melee abilities would also prevent ranged users from getting the bonus of extra damage with low risk, since they are far away.
Great ideas, hope these are taken up!