Unpopular opinion. Forget about your phone serving your photography needs, and grab something like an Sony RX100 for those trips you want to capture some nice photos. I see my phone as a device for quick snaps but wouldn't use it for capturing those special memories.
Phone makers are pushing the camera as the feature worth upgrading for each year, if you remove that from the equation you can get a solid performing phone for a very good price and use it for many years, instead of getting caught in the upgrade cycle.