I'm in the same boat. I also have the M7 32GB. I am pretty much maxed out on storage. I don't use the cloud for storage either. My decision has come down to the Note 5 or Edge+. G4 is out for me because of the controls/buttons on the back of the phone. My mom has a G3. I messed around with it...