I have the same setup. ugraded mine to 32gb of Timetec 32GB KIT(2x16GB) DDR4 3200MHz (DDR4-3200) PC4-25600 Non-ECC memory, and a LEVEN JS600 SSD 2TB 3D NAND SATA III Internal Solid State Drive, both from Amazon. Install took al o 5 minutes, and its been running great since. Also, it cost less than $150. Got both from Amazon.