I feel like another notable tera option could be steel, since it has the defensive benefits that Water and Fighting tera have (But even better, since most of the now-neutrals turn into now-resists). It doesn't have quite as much offensive potential, but you gain resistance to all of Urshifu's...