I'd go with CPU. With Kaby Lake now shipping, prices are about to drop on Haswell-E, Broadwell-E as well as Skylake.
A while longer and Nvidia cards will too, with the anticipated launch of AMD's Vega and subsequent Nvidia Ti's. Existing 1080's will be a bargain.