Good phone to get after OnePlus 2?

I don't know if this is the right sub but my OnePlus 2 just suffered a big shitpile of injuries and I'm looking to replace it. I know the OnePlus 5 is coming out soon but it looks to be a lot more expensive than this one and I'm not sure if I want to make the commitment to it, especially considering I only had it for like 6 months. The only thing I didn't like about this phone was the camera and the thickness but I know that can increase the price a lot so they're not that important.

Thank you for your help 💕💗😘