Check the ram specification first and make sure the new one that you get is of same spec or at least similar so it runs at the same frequency. As for the storage get an nvme storage. Try XPG gammix s70 blade. an affordable gen 4 ssd with high speeds. I personally use 3 of them in my pc and 1 in PS5