The USB-C is probably the "best" in the consumer world. But the cables are just as likely to wear out and quit charging as any of the other profiles.
Before spending a fuck-ton of $$ on a new phone, try a new cable and a new wall wart. While your new phone will come with these, it never hurts to have a dependable spare charger set up.
I have had good luck using Samsung and Sony devices in the past. I am due to upgrade as well, so I will have to do a bunch more looking before I leap to a new cell system.
Try replacing your charging equipment as you consider spending lots of money on a completely new system.