Welcome to Android Central! I would personally recommend the Huawei P20; but I am more of a Huawei fan and am really in love with its hardware and software. Plus, the camera setup looks great.
EMUI is grown up and isn't gimmicky anymore. The top scroll down settings menu has a few useful shortcuts that are very intuitive. Samsung still overwhelms you with all the bells and whistles.