Hi I have a 6 Plus, still have warranty till late January of next year, should i upgrade to the 7 or wait for the 8? i can't decide, i usually upgrade very two generations, but now it seems that the 8 will be a massive upgrade compared to the 7, the 7 and the 6 plus look extremely similar