I went from an iPhone 7 to a OnePlus 6T and have absolutely loved it. The stock camera isn't incredibly better (although certainly an improvement), but Google camera ported is incredible. So, that is definitely covered.

Battery is phenomenal. It's easily a 2 day phone if you aren't using it all the time (like I do). And, charging speed is incredibly fast; it will blow you away.

And, most of all, the software is best in class. OxygenOS (their software) is totally bloat-free (unlike many others like Samsung), very clean, extremely customizable, and so snappy. It's really amazing honestly. OnePlus is also one of the best on Android updates.

So, if you want to go OnePlus, you could go with the OnePlus 6 from last may (pretty much the same as the 6T with a few differences like headphone jack, smaller battery size, rear fingerprint sensor rather than in-display, etc.), the 6T out now, the OnePlus 7 in May probably that will be updated with the newest processor and some other changes that we don't know of yet, or the OnePlus 6T on a brief flash sale when the OnePlus 7 comes out (probably $550 starting -> $450).