is it time to upgrade?

[HmmR]

i bought my samsung s4  on April 2013 first day it came out

 

so i was planning to upgrade my phone but is it a good time to upgrade

 

every ting works well

the phone is rooted and runs snapy on android 5.0.2

the quality of camera is not so good

battery life sucks

heats up so badly i literaly need to leave it cool for 8 to 10 min ( i have reached 85c by playing clash of clans)

[zlolslavez]

if applicable i would wait until the 2 year upgrade period passes, if it doesn't ,i would still wait to see releases like the s6.

[HmmR]

i planning to buy something like s6edge htc m9 or lg 4