Question Workstation upgrade

[Moussa_18]

Hello everyone, and thank you very much for your time !
I need to upgrade my PC to something more fluent for a CAD workstation. I work mainly on architecture, so needs to be working well with 2D/3D software (modeling, rendering, animation) and CAD.
My current config is quite old and I can't upgrade it in full due to a tight budget, so I want to move one step for the near future and also be able to upgrade after :
CPU : AMD FX 8350
Mobo : Gigabyte 970a-ds3
Ram : Patriot 16g
HDD : 500gb
GC : GTX 970
Which one of the following will upgrade the PC performance at the lowest price ?
1 - Replace the storage by an SDD.
2 - Only replace the GPU (by an RX 580 or GTX 1060,6g or 1070).
3 - Replace the CPU + Mobo + Ram by Ryzen 2600 + b450 + 8g 3000 ram
4 - N° 3 + SDD
I know, this looks very tight, but these are my only possiblities now. So do you propose something from the list ? Or, do you have any other proposition ? Or should I wait until the 3rd gen Ryzen come and see if the prices drop again ?
I am really really thankful to you for your help.

 

[Dark Lord of Tech]

- Replace the CPU + Mobo + Ram by Ryzen 2600 + b450 + 8g 3000 ram

 

[Moussa_18]

- Replace the CPU + Mobo + Ram by Ryzen 2600 + b450 + 8g 3000 ram

Thank you very much for this quick answer.
And I keep the hdd ?

 

[Dark Lord of Tech]

For now , but I would upgrade to a Samsung or Crucial SSD in the future.

 

[Moussa_18]

Thank you very much again. I found this SDD, and it seems that it's as good as the samsung evo :
DISQUE SSD INTEL 545S 256GB SATA3 BOX

 

[Moussa_18]

I found an MSI B350 MORTAR mobo at a nice price, but I'm reading here and there that's not a good choice because it can't be upgraded in the future with the new AMD CPU series.