Without doubt the Note 5, that's why I've spent some £££ to simply move to a N920C and 64GB. I do like the 6P (I love it's yellow skin now too

) but there are still a few faults for me.
Top end devices these days are all generally amazing devices, so often I chose by process of elimination. If they have little niggles that aren't right for me, for example the 6P is just that little bit too tall, the Bluetooth seems weak and the lack of OIS is quite a big one.
The Note 4's problem was it's speaker. I listen to a lot of podcasts and it just wasn't quite good enough. On the Note 5 I don't have that problem. The only thing that comes close, that I can think of right now, as a flaw that almost made me move on, was the finger print sensor. The Note 5's just isn't as good as the 6P's, but it's good enough.
I guess the other thing that was close to making me move (or go back to the 6P) was the lack of Marshmallow. I think I can live without it for now and it looks to be coming fairly soon.
Cool, I'll wait for/look forward to a message from you