McAvoy - still a bit light on shots, but fills hit/blk better - better cat stuffing option
Pionk will give you slightly better PP numbers - slightly better offensive option but doesn't leave MC barren
You can make a case for either depending on your biggest need.