Change the Kingston SSD and go with the Samsung 840 Pro. Go with the i5 4670k, and pick out a new 1150 LGA motherboard. The Asrock Z87 Extreme4, or the Asrock Z87 Extreme6, or even the Asrock Z87 Fatal1ty Killer are all good affordable Z87 boards (which will allow you to easily overclock your i5...