[bhdn]

In addition to the other suggestions, consider alternating the source of the mate. Argentinian and Brazilian ones are quite distinct in flavor. Lowering water temperature may lighten it a bit as well.