@ lewisner - as stated above I couldn't access the site he suggested because I've disable JAVA, too many negative things happening with that , so I went with most of the original specs except I did away with the second SSD, replaced it with a WD 1T 7200 Black, a different case with 3 fans, 16Gb RAM and the SSD is now 256GB. Got it for $1800. The important thing is I'm happy and now I have to wait.
Cool. Let us know how it works out.