Warrior Enchant and Jungle AD Casters

Elsewhere, I made a post comparing the relative gold values of the Warrior and Magus enchants:

Warrior enchant: 40 AD, 10% CDR, 10 Armor Pen = 1877 gold value Magus enchant: 80 AP, 20% CDR = 2373 gold value

Both of these items share a similar purpose of providing an early power boost to AD and AP junglers (respectively) who've just sunk a lot of money into the upgraded Machete (which doesn't grant combat stats. On my previous post, I argued that Warrior enchant might be underpowered (500g less value for the same cost) compared to Magus and suggested that Riot should revert the 5-AD nerf from patch 5.4. (I think the balance issues stemmed from the setup of the jungle and balance issues on individual champions, rather than any problem with the Warrior enchant.) However, a lot of people pointed out that the junglers who build Warrior (e.g., Rek'Sai, Vi) are naturally effective early in the game and therefore don't need as big of an early stat boost as compared to junglers who build Magus (e.g., Nidalee, Fiddlesticks). I don't think I've quite changed my mind about the 5-AD nerf, but there is a point here.

However, there's another class of junglers we're forgetting about here: AD casters like Kha'Zix and Nocturne. (Nocturne seems at least close to balanced right now, but Kha'Zix is apparently fairly miserable.) Being ability and cooldown-reliant, these champions need the big stat boost as much as the AP junglers. However, they can't get it because Warrior is balanced around AD bruiser junglers.

I'm not sure what the optimal solution is here. Personally I like the idea of reverting the Warrior nerfs and re-balancing the individual AD casters, but it's possible that we really just need two different items to enable the different playstyles of bruisers (who tend to be early-game focused and strong gankers) and AD casters (who ought to scale into strong damage-dealers in the late game, imo). Would be interested to hear your thoughts.