Dear God, I hope this situation settles down in the near future. As it is I have years of USB-C-looking cables that all do different things but are visually indistinguishable.
I also wish the USB IF defined colors for high speed lanes absent vs 5/10/20 gbps capable high speed lanes and then 60W/100W/240W power. All it needed were two color bands on the plastic part of the plug. If colors are too gaudy then go Braille-style, have a 2x2 grid on top and bottom of the plug where bit 0 is a little hole and bit 1 is a little bump. That's 16 possible data speeds and 16 possible power levels and so far we have only needed 4 for data and 3 for power.
Intel could've added a separate row for Thunderbolt.