I really have my doubts, because most of the gear I have won't be changing by then. The "solution" will remain for me to have two sets of cables for most of my gear: USB-B/C to USB-A and USB-C cables (because I'm not replacing my desktop anytime soon).

That's a bad solution.