Galaxy S6 is going to be announced soon. Edged out screen probably and metal body. I'm switching over to T-mobile pretty shortly. Reason being their free international data roaming (2G speeds only). Not sure what phone I'll get. Its just gotta have removable battery and a good camera.
Right now I have an iphone 5c and it's ok. I'd like something to take overseas with me (change out SIM cards so bad gu---, I mean, "allied partners who may or may not be narco-lords" don't have my home cell #). I tried the Galaxy Note 3 and it was so big and unwieldy I had to take it back. If the S6 is even close to the iphone 5 size I might be ok with it, but I can't see switching to a phone whose ergonomics (I don't have the largest hands) don't work for me.
The MotoX is probably the best phone ergonomically I have seen out there - and it has some nifty real world usability features I like. It is not an all-metal and glass phone however. The new HTC One M9 is interesting as well. I always liked that phone, never got one because the camera was always sub-par. This is rumored to be fixed in the new one - we will see.