Try the S25 Edge, it has both! Also DEX and a better camera setup too!