So we ended up getting the 15-cw0597sa, it's the 2300U with Vega 6 graphics, 4GB RAM and 128GB SSD, I thought the 4GB of RAM might be a little limiting, especially as about 512mb is shared with the GPU but it seems perfectly fine.
It does have an additional empty SODIMM so I could upgrade it in the future if I choose to do so.
Overall very happy with it.