Guessing it’s the AMD build?
Swap to the r7 1700 and overclock it. You’ll save money and take a minimal performance hit.
You don’t need that massive cooler for a ryzen chip. A good air cooler would suffice.
You don’t need an X board to ocerclock a B board would save you money.
You can save on a cheaper case.
For editing you might want to look at 32GB of RAM.
Maybe hold fire on the GPU because the RX line is getting launched so you might find the 1060 dropping in price, the 2070/60 being better value or finding a 1070/1080 for cheap used.