I currently have a standard S23 which is working great and I'm considering upgrading to a S25, S25+, or maybe the S25 Ultra. I usually upgrade every 2 yrs so that I can get a newer battery, however, I had the battery in my S23 replaced 6 months ago because of swelling. It's a hard decision for...