You’re so close to the release of the new iPhone I would just wait. I’ve owned/used the XR/XS and X. And imo I would not get the XR which is the cheapest upgrade. The quality just isn’t there for the price. For example, the pixel density of the screen doesn’t even match the capability of the camera. So that means that you can’t see your photos in their full resolution on the phone. It has the same pixel density as the iPhone 4. And for close to the same price with no trade in if you really wanted to upgrade, you could get a renewed iPhone X from Apple, which is a MUCH better option.

The iPhone X and XS were relatively the same to me. The XS had a better battery life than the X. The only thing the XR has going for it in comparison was extraordinary battery life compared to the other two.

All in all September is right around the corner. You could always get a charging case for your iPhone in the meantime if you don’t want to replace the battery on a phone you’re not going to have for much longer. You have two and perhaps a half months! I would wait. Don’t want to regret a purchase!