I have to say, in my honest opinion, you are completely wrong about the OnePlus two. First, OnePlus got rid of Cyanogenmod as their OS handler. Cyanogenmod has the biggest open source support out of any of the non-commercial android os support (commercial os's are Samsung TouchWiz, HTC, or Moto).
Second, the slogan of "Flagship Killer" killed the OnePlus 2 altogether. They use an invite program to get the device. Not only that, it's a device that doesn't support NFC. This is huge because mobile payments are on the rise. And they only took it off because they believed no one would use it. How wrong they are with Android Pay being released. The device has a sub-par camera and it overheats. Not to mention the battery life isn't that great. The price is not worth the problems it has. This maybe the last time we will see a OnePlus device. It will go away just like Milli Vanili or the Amazon Fire Phone.
If you want a true iPhone equivalent for a great price, look at the Nexus 6P. The Camera is second to best only to be behind the Note 5. It has all the latest hardware involved. It's pure Android. It has fantastic battery life (on paper). It has a vastly improved display. All of this, and the base price is $499 for the 32gb version. You won't find a better android device this year, I can tell you that.