I'm currently running modest 1080P gaming / photo & video editing rig with the following specs: i5 8400 / H370 ITX / 2x 8GB DDR4 3000 / GTX 970. I also put together an initial Ryzen test rig: R3 1200 / B450M / 2x 8GB DDR4 3000 / GTX 1050Ti, which has impressed me with what it can do despite its limited specs. I'd like to upgrade one or other and end up with a better setup ready for a new GPU sometime in the next year and move to a 1440P monitor. I'm not that clear what the sensible upgrade path for the i5 8400 would be, and what the best option would be if I had £170 to spend on an R5 3600 or used better Coffee Lake CPU. I don't mind which platform I upgrade, but I'd like to spend the money the best way.