Japanese and European car manufacturers can just source batteries from somewhere else other than China, then problem solved.
I believe the regulations explicitly call for a % of battery components to be US/NA-sourced. So, it's not just "ditch China" but also "buy American."