Same here. Though I did not intend to keep my XR, my aging iPhone 7 is showing its signs through battery life, I could not wait until September for a new phone. Though rumor mills have pointed me towards the 2020 iPhones, I would rather wait until at least 2021 to go all out on new Apple products such as a new Mac and iPad Pro. Hopefully the 2021 iPhones are a more refined version and any kinks that may be present are completely sorted out by then.
I will watch the keynote so I can see what features are present and possibly carried through for the 2021 iPhones.
Replace the battery. It's far cheaper and will breathe new life into your older phone. I'm still on my 6S with a new battery last December, and I am on the fence about upgrading this year. I still prefer having the headphone jack (which I do use), and I like TouchID better than FaceID. If I wait though, I think I'll have to upgrade next year regardless.