Reconfiguring an AMD PC for render work?

[ap0kalyps3]

Hello everybody, I got the chance to get my hands on a donated Streaming PC and was thinking about making a dedicated workstation out of it, I mostly do After Effects and Photoshop work, only sometimes I start up some Autodesk Maya

Here are the basic components, I can post a better list soon.

 

I was thinking about doubling up the RAM, if I can find the same pieces, also I want to add a M.2 drive where I would put the OS, I was also thinking about using a SSD as Cache Only and a HDD as Backup/Storage, probably getting another SSD for more work storage too.

should I switch the built-in GPU (Radeon RX580) for my current GTX1070?

any tips, or advices on my current thoughts?

 

my current PC has:

i7-4790 3.6 GHz

MSI GTX1070 8G

32GB DDR3 RAM

 

I would take my current PC as gaming only, because a reformat is long overdue, so I would buy a RTX2080 when they are available and swap the GPUs around

also I was thinking about putting both PCs on one desk, somebody got a good idea how I should go about it? or is it not worth the hassle and I should get 2 seperate desks?

[ap0kalyps3]

What do you think is better?
OS and major programs on M.2

only OS on M.2

OS on SSD and major programs on M.2