This is a tough one. I've had both phones and they're both great for different reasons. If you're a power user and don't mind the added size of the Note 4, it's the better pick. If you want a more fluid, smoother UI experience with a better camera and one handed usability, the S6 is the better choice. I'd pick the S6 right now after using both, but that's because I'm not being bludgeoned by bad battery life and I chose the Edge. The quicker UI, the camera, and the heavily improved fingerprint scanner make a big difference for me.
Posted via Galaxy S6 edge