Your windows OS is fine. I'd go with an Nvidia 1060 or a 1070 minimum. I'd lean to a 1070. But the question- on your budget? if you're reckoning with budget, you might be stuck with a last iteration 900 series.
as for storage, I'm all into these SSD M.2's. they are small and fast. I can boot and login in less that 20-25 seconds.
or.. wait till next year and go with the CoffeeLake processors (Q2- '18). they are supposed to be the 10nm process and the next gen. so it depends on you.. do you want it
now, or can you wait? because if the coffeelake is too much, then skylakes will drop when it releases. that's the way of the market.
another option is if your last gen intel, spring for a kabylake when coffeelake rolls out. you might get close to bleeding edge as possible within your budget.
another money saving aspect is, "do you want to shave some costs and go with an AMD?" AMD is a budget gamers CPU and can
still play nice with Nvidia. I have played with CPU's from both camps and I like both however, Intel betas AMD hands down on compatibility. AMD
can have some minor issues as well. Get a Motherboard as well from a trusted name. stay away from no name boards. ASUS, Intel, MSI and more..
TOP Motherboard manufacturers according to Toms Hardware (Trusted name in hardware analysis).
Also
Intels CPU roadmap
I hope that's
SOME help in the most important aspect of your journey.
I plunked 2k down for this MSI gaming laptop this past December. it was worth it. But as for CPU's with what's out there now, CPU's and systems can last a decade because the extra cores and speeds are so up there, the only reason to upgrade is for gaming or video work.