Hopefully with Vulkan, more cores will be more important then single core clock speed as it is now.
I have a feeling that an AMD build to prep for Vulkan might be a wise choice. That is unless Intel drops a competitor to the 3600/3700X at a similar price out of the blue.