I'll wait for the 6s, I always skip the non S versions. Historically the S is the fixed version.
that's funny, I alway thought the none S version fixed the previous one!
3g fixed useless edge, 4 fixed the bad display on the 3gs, and the 5 was a slightly larger 4s on a diet and the 6 finally addressed the little iPhone display.