In my opinion, your current plans are still good. THe thing that's most disappointing about the current Haswell line (i7 4790k) is the temperatures compared to older generation i7/i5s. It's more of an issue to keep them cooled under stress. Nothing like the high-end AMD processors, but still...
I doubt that Skylake will remedy that, unless Intel makes drastic alterations to the chip architecture.
I have heard that some of the VRM moves off-die, and that may help. If that is a concern to you, then you may want to wait, otherwise I see no real compelling reason to defer.