I think the Samsung J7 (2017) is even better bang for your buck. The 1080p screen is super AMOLED, there's a bigger battery, comparable camera, and a processor that edges out both the 625 in the Moto G5 and even the 820/821. And it doesn't have the ugly fingerprint and navigation bar setup the Moto has, but may lack in that 'pure stock Android' feel.
Consider this: in the US, the g5 plus comes with a magnetometer, while the g5s plus does not. For accurate walking directions, this difference is crucial. That, the smaller form factor and superior rear camera make the g5 plus a worthy choice over the g5s plus.