If you find your camera to be adequate, then keep it. The screen is better both on XS and XR. I would still keep iPhone 7 for at least 1 more year before upgrading. The new XS and XR have the best camera on an iPhone but still doesn't match up to Pixel 2 or 3. I am certain in 1 or 2 generations apple will catchup.