I am in the same boat (of waiting to update my Nexus 5, which I love dearly). What do you think of Moto Z Play---unlocked version coming at the end of the month? Inexpensive, a giant battery, USBC, quick charge, and reasonable price.