I don't know too much about phones and wanted to know if I should get a Motorola Moto X4 (bnib ~$650 after taxes, customs and shipping) or Samsung Galaxy S7 ($400 flat bnib) to replace my non functioning phone? I was leaning on the Samsung for its price and that it was a flagship phone but am wondering if the phone is a little dated and have little to no software updates now. I like the Moto X4 for its camera, 64GB, the fact its a recently released phone with likely newer features and would have software updates for a few years. It is a mid-range phone though compared to the Samsung.

Which would you buy or recommend and why? How about the Moto G5S Plus?