So, over two years ago, I got my galaxy s6 (still works fine, just old). I was planning to upgrade to the s9+ when it came out, but now i have to wait until mid July for my next phone. Because the Note9 is supposed to be a major buff from the 8, and the s9 wasn't from its 8, do I wait until September for the Note, or do I upgrade when I can?