unless you work a lot with FEA, in my opinion the best choice will be the e5-1630 v4 3.7GHz.
Please consider that SW is mainly single-threaded.
So with the 1630 you have a faster processor (3.7GHz vs 2.4GHZ... this a HUGE difference)
a faster RAM (DDR4 2400 vs 1866)
SSD config is enough (I would even choose a standard HD for storange instead of 960GB SSD)
Quadro M3000 is very good anyway.
SW could use more than one core in FEA, in drawing and in rendering.
But anyway, considedering the difference in the clock speed, I would choose the 4 core 1630 in any case.
My best regards