Honestly GW just needs to be redone. Forcing mono color teams is a bad mechanic, and is terrible team building. If anything it should encourage having troops of different colors, not same colors.
To point, yes, there should be either a percentage buff to mana mastery or static +1 to that color gem matches. 25 mastery is probably not even worth half of a percent at level 300 lol