I'd say totally scrap the HDD for a 256gb SSD. Large HDDs are only useful for people who really don't want to delete stuff(like me, I have TB's full of useless stuff that I just refuse to delete). And also if you do need the extra space, you can always put in a new HDD down the road, where you will probably get better GB/$. External HDDs are so cheap as well that if you really need the storage you can get one of these and rip out the HDD from it's enclosure
Don't forget about the simpler aspects of gaming on a PC such as how loud it will be. For me, I love a silent computer and less flashy(hate LED lights)
And while everyone is advising on upgrading the GPU, I'd just inform that changing the GPU in computers is extremely easy. If your GPU is too weak after a couple of years you can always sell it and upgrade.
Personally I am also planning on a PC build but my friend is getting me a great discount so most of the choice is out of my hands. I plan to just take my current ancient GPU and use it up until Christmas and will upgrade then.
Hope this helps.