I agree with Rob that an SSD is definitely where you will notice the biggest quality of life change. The 500GB Samsung he recommended gives you plenty of room for your OS, Adobe programs, and a few games.
With the reported slowdown using LR and PS, that's where the increase in RAM will be help...