Intel won't have any hardware fixes until late 2019 at the earliest and that's only for Spectre. Brain Kraznich already announced that they won't be starting HVM production until H2 2019 at the earliest. Even if they have a fix, they won't sell it to you. Also, they have not even publicly addressed spectre-NG
AMD have already announced that Ryzen 2 will include a spectre fix.
If I were you OP, I would avoid anything intel-related until 2020 and only buy Ryzen 2 if you need x86. If you have to buy something today definitely avoid intel as they have 2-8x the amount of security flaws that AMD chips have (and they are more exploitable). The patches to fix these drastically reduce performance across the board, to the point that intel now loses many benchmarks it used to win before the patches.