I'm thinking about a new 7700K vs 1700X too.
https://www.dropbox.com/s/jrjit1htr1...RyzenSetup.xps
I think I will spend a little bit more on internal storage and a hopefully quieter fan upfront then your setup.
Sadly there are still not many real world AMD vs. Intel examples out there.