Some companies fight on the side of users in this war. Check out https://puri.sm/products/ for an example (happy user).
https://starlabs.systems/
https://system76.com/
https://www.pine64.org/
https://www.tuxedocomputers.com/en
But the first company (Purism) specifically attempts to change the industry, they state it as one of their goals: https://puri.sm/learn/why-purism-computers-are-better-than-p....
And for completeness:
Purism’s CEO Todd Weaver Testifies at California Congressional Privacy Commission
https://puri.sm/posts/purisms-ceo-todd-weaver-testifies-at-c...
Do you happen to know if any of these companies monitor their supply chains to avoid China? I recognize that that's not the fight that many of these companies are fighting, but it seems like a worthwhile one that would probably tip at least me over from one option to another.
I've done a little poking around myself, but haven't seen anything.
On the hardware side, they are trying to produce their phones outside China, but it’s expensive: https://puri.sm/products/librem-5-usa/ ($750 for phones produced in China vs $2000 for those produced in the USA).