At this point ZOS needs to modernize the game by having a separate Skill data set for pvp. It wouldn't be hard to implement either as they would just need to clone the current data set and make it so when you enter a pvp area your skills change over to the new pvp set of data.
In a way ESO is in an advantageous position to implement such a system compared to other games that had to do the same like WoW. Since there is no concept of constant open world pvp, like in WoW, you only need the data sets to switch on either load screens to a pvp area or when some one accepts a duel request.
They should really consider changing the tool tips for skills and a lot more sets. For example the monster sets should often have separate too tips as they may do things that are overtuned in one environment and perfectly fine in another.