Wanted to upgrade from One Plus 7 (2019)

I am currently using One Plus 7 since 2019 and i loved it bcoz it is from those days of true oxygen OS. I liked its OS and form factor (6.4" not small not large) and still working fine for me. But due to recent news of One plus bricking news of its older phones and bad battery back up, I am thinking to buy new device while using it as secondary phone.

I want to buy phone which is between 6.1" to 6.4" (flat display) and have clean OS. Thinking to buy S23 in upcoming BBD sale. Please suggest if any thing else can also work under 40K INR price range and also reliable since not going to replace before 5 years.