In my view, the Moto X. Both are quite similar in terms of screen tech, cameras, build (different takes but overall similar quality) and processor. Screen size absolutely breaks the deal for me. You're also getting expandable storage (5X only goes up to 32GB internally, so that can be needed), bigger battery and customisation.
If you're looking to buy, it could be worth it to wait for the next Moto. Don't know how long it will take, but it might be worth the wait.