I'd get the regular S6 if you're going to go the Samsung route. I've used the Edge, and it's definitely eye-catching, but it's hard to justify the premium unless you can't help but smile every time you see it. I'd probably roll the money into either a higher-capacity model or accessories like cases and wireless charging pads.
If you're intrigued by the G4, I'd get a leather model if possible... though I suspect you were already leaning that way!
My employer is going to buy me whatever I decide on. Only catch is that I'm going to have to live with it for the next 2 years so I'm kinda sweating the decision.
I like the leather backs on the G4 but not super thrilled that I have to go with another back if I want wireless charging. And I could live with a S6 but I love that Night Clock feature on the Edge.