Of course.
They talked about that in the podcasts etc.?
Yes, splitting this up and making people choose their defenses makes more sense. Either that or add -10% attack time to Onslaught so people feel like choosing that.
As it stands right now, barrier is more powerful and useful than Affluent (which is clearly retricted to war so that people don't whore with it, although with the other mechancis choices of this age, that restriction makes little sense to me.)