Probably it is too late for response about upgrade, but here it goes:
I run PI on 8gb of RAM and never saw a need for more memory because I never noticed swapping.
I also doubt that Ssd would increase performance much.
PI is all about number crunching and for that you need CPU and not Ram or Ssd. Keep in mind that some CPUs have many slow cores (AMD) and some have fewer but faster cores (Intel) . For PI I would chose fewer but faster cores, i.e. Intel.
IMO i7 4770 and similar are the best choice right now. A CPU and motherboard would run for around $300 which is not much.
Alex