Whether or not it took "courage" for Apple to remove the headphone jack, there are two things I know:
- Removing the headphone jack on the iPhone 7 does not solve a problem for me.
- Unlimited storage for photos from the Pixel in Google Photos does solve a problem for me.
Still got a year to go before I can get a new phone, but this will be a consideration. YMMV.