I'm going through the same situation right now I'm starting college next year for a industrial design major with a minor in CS, I been looking for a laptop that will last me long, my main priority is battery life, and the 2 in 1 functionality.
For me both the Spectre vega and the xps 2 in 1 are out since the battery life is really poor on both (though if I would choose one int would be the xps for ssd upgrade ability, maybe try under voltage), though I'm still deciding my main option right now is the spectre x360 13 with the mx150, my second option is the yoga c930. The xps 13 2 in 1 is out since it has a 2 core processor.
P.D. with both of this laptops I'm considering using a eGPU for CAD programs though it would be really expensive I haven't decided in it if I dont go that route I will get the Lenovo P1 with the p1000