I'd hesitate to renew
We bought few of the 5 and had issues with connecting to data networks overseas, more problems that with any other handset. Although some of that can be put down to new devices (said O2) I won't jump at another "new" anything, probably stick with a model that has been out for more than six months, so at this rate of change maybe not even another OnePlus.