Get the s6 edge plus or wait for s7

I'm planning to get a new phone in a month or so and I'm torn between getting the new s6 edge plus or waiting it out for the s7. Right now my HTC m8 is having some issues from the sim card being really hard to detect to a disconnected flex or something like that so my rear camera doesn't work. I'm taking this into account as its a pain to deal with a phone that has so much stuff screwed up. If there are any other releases of company flagships coming out close to the time I'm getting a new phone, please suggest them, thanks in advance.

Sent from my unknown using XDA Free mobile app