The Moto G4+ has a score of 84 on DxoMark. Mi 5, which has the same sensor as OnePlus 3 has a score of 79. Though I haven't seen reviews comparing these, Moto G4+ camera reviews seem to be pretty good.
Will check out Samsung On / Nxt series as my experience with their service is better.