Replacing computer parts at worst possible time, help

File: building-a-computer.jpg (82KB, 400x328px) Image search: [Google]

82KB, 400x328px

Before I being, I know the attitudes towards doing your own research around here--I've done the research I can. I am asking the questions because the answers I'm looking for requires years of experience in these markets that I just don't have.

My system seemingly survived a catastrophic PSU failure about 3 years ago, but it's finally dying. Motherboard is shot (1 PCI-e slot is dead, the other two are having serious performance issues, back I/O only partially functioning), and my old 7950 died (pretty sure the faulty PCI-e slot killed it).

I have plenty of stuff I can salvage (CPU cooler, PSU, storage, case if I want to) but I need a new mobo and GPU, which puts me in a predicament--I don't want to spend the money to get yesterday's hardware, but given the highly fluctuating state of newly released hardware I know I'm going to get the shit-end of the stick on stuff, especially GPU's, price-wise.

So, my question is this: should I go ahead and get z170/skylake/ddr4 and a 1070, or should I wait for prices to come down on the 1080/see how the 480/1060 matures? It is not a buyer's market right now, and I'm not exactly made of money. Should I just wait and see what AMD releases later this year and how NVIDIA answers?

For reference, I don't really care about 4k gaming, but I'd like a card that good enough to let me subsample 1440p/handle 1440 when I eventually get a new monitor.