Okay, after weeks of poking around, and half an hour poking on it in the store, I'm going with edge+.
-- I loved my Note 3, but never ever ever used the S Pen. EVER. And yet I loved my Note. Why? All the reasons besides the S Pen. Big, beautiful, fast, juicy Android goodness, etc etc etc.
-- I am likewise not planning to use the edge features. Kinda interesting in theory, but nothing that jumps out as must-have. But it's big, beautiful, chock full of juicy Android goodness, and I like the SHAPE of the edge.
You know what REALLY did it? Having the Note for 2 years already, getting the Note 5 felt like buying an OLD phone, not a new one. Yes, yes, faster, higher res, more useful pen. I'm a believer. I really truly am.
But I'm also 100000% shallow. Every one of my last phones has brought a change in form factor, and being entirely that shallow, that's what won the day.
I can't thank you all enough though. Even though I went the other way, I agree with you all on almost everything. LOL Your wisdom is why I've been lurking in this forum for so so many years, and I truly appreciate it.