Exactly I am strongly leaning on keeping the Note 7. I purposely held out on the S7E for the Note and my wife has the S7 which is too small for my tastes. I am less concern about the battery than the travel bans and limitations LOL but I am sure that will be cleared up once the recall is done. Otherwise at least it gives me a chance to use my Note 4 again which is still a great phone even today.
I am actually still using my Note 7 full-time until I get my replacement but am careful when charging but I still use my Note 4 for media or when my Note 7 is charging...I love the Note 4.
It will be as bad to switch it off even. My flights are usually more than 10 hours.