Primal Madness has very limited use for Cats

This talent could use a rework for Cat Form. For Bear Form it adds a nice bit of snap rage, making it extremely useful for opening a pull (which is about the only place bears ever encounter significant threat issues). But for feral DPS, increasing max energy with Berserk or Tiger's Fury active is essentially pointless since no feral is going to pool up 100 energy while DPSing anyway. (Kitties, you know this to be true. Please say so.)

It would make a bit more sense, and the 2-point talent investment a bit more useful, if the talent itself looked more like this:

Q u o t e:
While in Cat Form, your Tiger's Fury and Berserk abilities instantly generate an additional 10/20 energy and while in Bear Form, your Enrage and Berserk abilities instantly generate an additional 0/12 rage.

This would make the talent a bit more useful for feral PvP as well as for PvE ferals in both tank and DPS roles. The energy gain should naturally stack with King of the Jungle, and this doesn't, to my mind, present a balance issue since cats' only way to exceed the standard 10-points-per-second energy regen rate is by popping talented Tiger's Fury or Berserk (which is essentially the same as Adrenaline Rush for cats, but addresses the other side of the equation).

Can anyone else think of a rework that would help make this promising talent better, or does anyone have thoughts on issues presented by the above idea?

Edited for clarity, grammar and the parenthetical comments.