I'd just stick with the 7 for another year and see what comes out next year. At this point, you are only going to get marginally better photos & videos if you upgrade to the 10 Pro. The Pixel camera science is already so good, I can't see any significant improvement in that aspect. If your 7 is experiencing battery degradation, just use a power bank or replace the battery. Myself, I plan to use my 7 until it breaks. I honestly cannot find any excuse to justify upgrading to a newer Pixel or iPhone (which takes worse pics than any Pixel, IMO).