Why not both? I'm keeping my S21 Ultra and have a Pixel 6 Pro 512gb on order. Google will fix most of the issues. Also, don't forget you can also port the Google Camera to the S21 Ultra. I've been using it with my Ultra for months and get great results.