From you post I imagine you know that there are some modules with a new USB C port being manufactured and given the demand that may be your best option unless you get the current one repaired.
See the following post which gives an idea of what is involved