It kind of sucks though to think about getting a phone and then have a major update slapped onto Marshmallow within a couple of months. Talk about bloat. My Note 4 is so bloated right now with a Lollipop and then Marshmallow update that I can no longer update apps even after moving everything I can onto my SD card. The only way I could update apps right now is with a factory reset and I do not want to customize this phone if I am getting a new one in a few weeks.
That said, the Note 7 will have twice as much internal storage but there is always the risk of needing a factory reset after a major update, so if the phone doesn't ship with Android N, then my personal opinion is that I am not in a rush to get it. Would LOVE six months with a clean phone with no issues.