In this camera/video comparison, the Note 4 pretty much owns the IP6+
https://www.youtube.com/watch?v=Arah2K_xvCk
Hopefully the phone interface is improved, and the slew of software bugs are removed prior to S6.
On the S5 the camera has serious macro focusing issues, is very slow opening and has crashed my phone on see several occasions when opening from the lock screen . Getting out the camera app directly into gallery is also maddeningly slow.
When I had the iPhone 6 I could navigate with far more ease, never a hint of shutter lag and the switch between shooting modes happens in a far quicker fashion due to the more intuitive interface.