My 6 Plus is having issues holding a charge. However, that's the only complaint that I have about it. Would it be pointless to upgrade to a 7 or should I get the battery replaced and hang on until next year when the alleged iPhone 8 is released? I keep going back and forth about what to do.