I prefer keeping the headphone jack, but am not against a second USB-C port. If you make the device thick enough for a headphone jack to work properly then you

I prefer keeping the headphone jack, but am not against a second USB-C port. If you make the device thick enough for a headphone jack to work properly then you've got room for a reasonably large battery and the extra ports without any issues. Mobile phones are thermally constrained these days anyway.