Only if mastery is a bad stat that we don't stack. More mastery makes agi/BA worth more AP in the exact same way more agi/BA makes mastery worth more AP. Regardless, Agi is worth about 3x as much AP as mastery right now, so unless we go crazy on agi while managing to avoid mastery in heroic fashion, they'll never be close.