Xeon or i7 processor for SW 2015 - SW 2016

Hi all,

About to upgrade the internals of my SolidWorks workstation when I switch to Windows 10 next week.  Trying to decide between a Xeon and an i7 processor, and what specific model.  What are the considerations when choosing between the two?

FYI, I am currently running an i7 2600 (3.4 GHz quad core), a 2011 vintage CPU, with 16 GB of DDR3.

Would going to 32 GB of DDR4 be worthwhile?

Thanks for any advice, as always.

current setup below:

SolidworksAdministration