If we're really so concerned about 'supply chain' issues we could build up a strategic reserve of batteries and solar panels. If china wants to continue subsidizing their industry below costs of manufacture I see no reason why we shouldn't exploit their generosity to meet our climate goals as quickly as possible.
One of the 'good news' stories re: the recent datacenter buildout is that grid storage is now being more widely deployed, and that compliments the roll out of renewable energy.