I'd opt for the PvE farming team.
Whether it is mages or not.

You already have a strong PvP team.
Not saying, don't tweak it to improve it.