Keeping it.
They gave me a free SD card 64GB and a battery kit. As much as I like the S6 (the only flagship worthy to compete with the G4 as of now), I cannot go back to 32GB with non removable battery, and no expansion memory (Samsung only sell the 32GB option in where I live).
With the G4...