Currently you have 35 Agi listed as an upgrade to Savagery on a 2H weapon for a hunter.
This is dependant on spec, in order to make such an assumtion spec checks would need to be made.
If the hunter has deep survival talents (Lightning Reflexes [+15% agi] & Expose weakness) then 35 agi is superior, but if you use the cookie cutter 41/20 BM build Savagery pulls out ahead. Im an rather uncertain about MM builds since they feature very rarely in PVE situations compared to 41/20/0 or 0/20/41 - but i would imagine that Savagery is slightly ahead since you dont get the extra Agi scaling that Survival gives.
Will update if i see anymore issues with hunter enchanting