Hi guys current situation - HTC One M7 with torrid battery life. Won't make it past 4 hours with light usage not to mention it will brick itself for 3 hours every time I try software update (damn you insurance phone!) Upgrade is due on the 22nd February, so I ask the question is it worth getting a 6 plus in 2.5 weeks time or should I wait till the next gen phone comes out in September? What would you do in my situation? Thanks!