Sadly nothing fixed it and I tried a dozen things.

Totally anecdotal but I have had a Nexus 6P for over a year now and no issues with the USB-C port so, for me, it is just as durable so far as Lightning :)