I would highly suggest purchasing a tempered glass screen protector and a case. Those are worth their weight in gold. I find even having the smallest case and a glass screen protector helps alot. Often I find myself with a cracked screen protector after a few months but at least it's not the screen.
I don't think you can go wrong with either phone. I have heard that the Samsung S8 has better low light performance.