It really is a shame that the USB C ports are not modular on newer ThinkPads, you basically have to send the laptop for board work to get them replaced once the USB C ports go.
Not really, I had mine replaced at revolt.bg for about 60 EUR, both labour and spares. Miraculously, they had both of them on stock, so it was a Thurday to Wednesday job. Massive respect to those guys.