Legumes will deal with the endophyte, improve livestock performance and add N for the grasses as a triple plus. Farm for legumes, including seeding and reseeding when it favors the legumes, and the overall will be better. Don't just stick with one species of legumes - plant and trial multiples...