Ryzen would probably be the better option here. That said the OP should elaborate on which software is gonna be used as that would be the determining factor at the end of the day. Some apps love plenty of cores while others like high ipc & clocks. It's not a simple x will provide the best performance thing, when comes to imaging, video, rendering & cad you really have to look at the apps you are using and how they perform on a specific platform.
+1 that's why I think it best if OP goe visit forums of the software he'll be using, Premiere etc.