So I have a build here but I don't know if I could get better for the same price? https://pcpartpicker.com/list/vjDYKB
It's a pretty good build just the way it is. I replaced the 970 Evo with the Crucial 500GB drive. The 970 Evo is a very good drive but I don't see any compelling reason to keep a M.2 drive when the budget is already a little too high. The Sata drive will handle streaming and gaming without issue. The Evo would be a little overkill unless you can afford it.
Another change that could lower the price a bit is by moving to G.Skill Ripjaw V's. They're a reputable brand so I'm not destroying its value with some cheap offbrand but it's still fast enough for the Ryzen 2600X. The 1st generation of Ryzen chips loved faster than fast RAM but that issue isn't an issue anymore.
I'd suggest swapping the 1070 for a 2060 and then downgrading the CPU from the 2600X to the 2600 - you won't lose anything there but you will gain a lot with the newer generation of GPU: