I currently have an iPhone 6S and would like to upgrade due to the depleting battery. Having to charge it multiple times a day has gotten too much. With that said. Should I jump on the Xs or await the announcement next month for the newer iPhone? I assume the prices would also drop for the Xs shortly after the announcement? Thanks!