Having a device that's now confiscated before flying associated with the name Note is not going to go away. It's best for Samsung to drop the Note brand name and just expand their S device to a larger form factor.
I've been a happy Note owner for years, 3 different versions but when the specs on the Note 7 came out I saw it as a loser, too thin, too little battery life and I have to use mine on many flights. I've now had to show multiple flight attendants and gate agents that "no, this is a Note 6, not a Note 7." Sorry, next upgrade will be an LG for me and the Note is dead to me.