Smartphone dilemma HTC M8, S6 edge, etc

Hey guys I am in a tough spot, I just got my HTC M8 back (It had a cracked screen so I sent it in so they factory rested it lost all my data and my sd card doesn't work :(.... ). I am a POWER android user, my dilemma is I can't seem to get my self to reconfigure(root, install all apps and etc) and fully customize my M8 anymore and I really like the s6 edge. My brother is willing to buy off me for 500$ (the M8). My question to you guys is should I wait for Q3, Q4 to see what other smart phones have to offer and stall off and keep my M8 or sell it and get the edge. Now the catch is if I stall for too long my brother does get the opportunity to upgrade before a appealing smartphone comes out for me, (I'll try my best to stall :D). But if he does I am left with a M8 that I won't be able to sale for that price.

To boil it down Is upgrading from a 2014 M8 to a 2015 6S EDGE really worth at the moment?
 
Back