This is a bit better, let me explain:
Since you said you'll be working, I put a Ryzen 1500X, because it has hyperthreading like an i7. It's basically an underclocked i7.
With this motherboard, which is for overclocking, you should be able to overclock to 3.8Ghz, most CPU's can reach that. At that point, it's single core performance is equal to the i5-7500 and it's multi-core is much better.
The fast RAM is because Ryzen doesn't play well with slow RAM.
M.2 SSD - very fast. ssd.userbenchmark.com if you want to check. It's faster than the Cruicial.
Kept the same case, thought you like the looks.
The peripherals, I didn't touch, because it's up to preference not rating.
PCPartPicker part list /
Price breakdown by merchant...