You'll get a much better deal anyway if you do that. I never buy the current generation of hardware. Much better value per dollar to buy one or two generations old. Unless you absolutely need bleeding edge performance.

All the security changes, plus 7nm chips should be widely available and will hopefully bring a price decrease.