Greetings Brothers!

I need help in choosing a system configuration that I will be running Solidworks on

To be used for (Application)

1) High End Rendering and Visualization tools. Photoview 360

2) Lot of Documentation Work (Solidworks Composer)

2) Low End Simulation (in future) (on Solidworks Flow Simulation). As of now very light simulation.

We have been advised a 

Option 1:

DELL Workstation T-3630

Processor:                                              XEON E-2124

Memory:                                                 32 GB- 2.40GHz

Storage:                                                 1 TB HDD +256 GB SSD DVD RW

Graphics Card:                                       P4000 with 8 GB DDR5 Ram

OS:                                                         Windows 10 Pro 64bit

Option 2

Assembled

Processor:                                              i9-9700k

Memory:                                                 32 GB- 3.0GHz

Storage:                                                 1 TB SATA HDD +512 GB M.2 SSD DVD RW

Graphics Card:                                       P4000 with 8 GB DDR5 Ram

OS:                                                         Windows 10 Pro 64bit

Questions

1) XEON E-2124 vs Core i7-8th Gen.

Which is better for applications I have already listed above. I have max assembly size of under 500 components.

If Core i7 is better should I go for Core i9-9th Gen?

2) Should I go for M.2 or Plain SDD?  

Please Answer in points referring to Question 1 and 2.

I already appreciate the people answering.