I don't think that Rage works, thematically, with any of the subclasses besides Berserker. I'd actually take Rage and make the Berserker into a Fighter subclass. Then, I'd dismantle the Barbarian class, entirely, and replace it with a Warder (or whatever name you want). This new class would have three subclasses to start with:
1) A totem warrior that pulled the totem concept from the existing subclass, tweaking as necessary to account for not having Rage.
2) A shifter that stole the Druid's shapeshifting ability and made it worthy of standing without spells. (Yup, that means Druids aren't shifters -- at least not the alpha shifters.)
3) A beast master that stole the Ranger's pet.
That'd actually fix problems with three different classes. But, the Barbarian as a raging warrior? Nah, cull it from the game.