I pre-ordered a S8+ a few weeks ago, but then saw the G6 and decided I should try it out and return it and get my pre-order if I didn't like it. I had a Note 7 and then ended up with a S7 Edge that I never really liked. I will say that Samsung's UI has come a long way since my Note 4, but this G6 is blowing away the edge. It is snappy, responsive, and I love the build quality and form factor. The screen is really good for LCD. My egde screen is better in certain ways, but I am loving the display on the G6. The bonus is that the display is flat and I can finally use a TG screen protector again.
Long story short, I am keeping the G6 and will wait for the Note 8.