Depends on what you play more - MM or BM. BM priority has Mastery over everything else, so in Yellow sockets I've been dropping Agi/Mastery gems. I've also seen a few hunters running full Agi gems (and completely avoiding Socket Bonuses), but haven't tried that yet myself. Definitely drop any sort of Resil gems/enchants you have and replace them.