X99 or z170,what is better?

Gi guys.I want a pc that has to be powerful in all things:gaming,editing,developing,multimedia...I have 1000 euros of disponibility.I have thought to a z170 configuration for his chipset's faster bus than x99 and because a new and faster technology than x99.To the other side there are a lot of pci express lines for gpu and quad chael for the ram.I have thought also at the upgradability and I think z170 system is more upgradable because in future I could install Skylake 's six core or octa core processor.What do you think?What type of configuration do you suggest me?