Upgrade to my poco F1

Suggest me a good phone to upgrade from my poco F1.. use cases and requirements are as follows.. 

Budget 30k.. can extend 2-3k if needed..

Performance and gameplay (snapdragon preferred as I emulate too)

Atleast 5000mah battery with charger in the box

Better display than my poco F1.. 

Camera, build quality and UI not a concern at all.. 

My poco F1 has been running since 2019.. into its 8th year now.. want a similar long lasting phone atleast for the next 3-4 years.. 

Poco F6, iqoo 9 & 10, realme gt 6t are all out of stock