Agreed.
Since you're coming from an S3, you may also want to consider the size difference closely. If you've never had a phone the size of a Note device, you should go to a store where they have them on display and really play around with it and see what it'll be like to use on a daily basis.
Going from the S3 to a Note will be a pretty big jump and you may find that you'd rather keep it a little smaller and go with the S6 instead.
If you're going with the Note and can afford it, I'd definitely try to wait for the new one. If you're waiting this long and will have the money either way, you might as well get the newer device with improvements made from lessons learned on this one and it should theoretically not get too outdated too quick. Since you're still holding onto an S3, I'd think longevity is important to you.