Oh sheet, OP were about oaths...
I think they are fine as is. On tank swap situations I just "prepare" the correct one and lose the few seconds that may be used for dps, but my dps is really not needed for the fight, it is just a bonus but not required. Yes more dps always welcome but not my duty there and a failing dps check will hardly be my fault.