I'd seriously consider buying the note 6 at launch if it adds to the already great package -
Larger battery (4000mah ish)
Water resistant (ip68)
Base model being 64gb, with up to 200 on board
Removable SD, with the option to store apps too
Actually being black in color when it's called black (although I don't mind the blue)
More solid feeling s pen (don't mind the device being slightly heavier as a result)
Bring the temp, humidity, etc sensors back on board
Less bloat, TouchWiz being lighter
Stereo speakers (keep the bottom one where it is, but add the second to the top in the same spot, please do not put them on the front face or the back as this would ruin the phone for me)
Camera upgrade (still want 16 megapixles with better low light like s7)
Keep the capacitive buttons and physical home button, another deal breaker without (hate on screen buttons, what a waste of screen and phone size)
And yes, faster software updates on carriers....