I'm in a similar position - I want to upgrade but at the moment I'm treading water waiting to see the lay of the land. DCS will be a primary application , but i do play other games in ( mostly ) VR, and will be looking to convert my media library to h.265 ( So an 8700k, 1800x or Ryzen 2 are on the table )
If I go with an 8700k I get a 5-8% drop in performance and 30% degradation on my SSD reads ( Windows 10 defaults the format to 4k blocks - I've not read if changing the block size to 8, 32 or 64k has the same impact)
I'm waiting to see what Improvements 2.5 will bring with regards to multi-core support which may help swing it to Intel or AMD
Ryzen 2 in April has big improvements to Precision boost for games mostly on a single thread ( Ring any bells? ) - Marketing blurb lifted from a site below: