I'm going to be very annoyed if Apple ditches the Touch Bar and gets that close to making the perfect laptop, then takes away my USB-C charging.

Knowing Apple they would never offer both.