In my opinion, it is worth waiting to get the XPS 15, I'd recommend 8th gen i7, 16Gb of RAM, 1050ti. It would last a lot longer, and be a lot faster, and is overall better. I use an acer predator helios 300, it has all above specs, except for a 1060 instead of a 1050ti, and it cost 1000 USD. The main drawbacks to it are short battery life and meh cooling. I'd recommend the helios, but I think in your use case the XPS might be better.