Wait for the Note7 to become official. Then weigh your options to see which is better.
It depends on your needs. If you are not really going to use the pen then stick with the S7. I use my Note 4 for business. I use the pen daily for transactions. I will do the same when I upgrade to the Note 7.