Consider using one of these for USB-C (where the second row of pins sticks out down and goes into the holes through the board)

Should help with soldering to get less defects (my order of 5 boards came in with 4 of the boards not soldered well 😢 and only one was perfectly working).
I guess it's a common pain of the surface USB-C connectors - seen people complaining about them on the internet too - because the second row is hidden on the bottom of the connector and you can't really resolder it without detaching the whole thing.