I would run EF for scaled gear content.
For Challenge Modes, you should be running a mastery heavy build and low spirit, since you'll be able to use the amber to regen mana.
For Endless Proving Grounds, should be running a spirit/mastery stacked build, as you only drink every 10 waves.