The best of both worlds is what we have today - you can use either magsafe or the usb-c ports, so you have the extra safety if you bring the extra cable, or the extra convenience if you can't be bothered. There's some third-party offerings out there for magsafe-style USB cables.

That's what the new magsafe cable basically is. A magnetic USB-C cable that (probably) isn't garbage quality.