So a little over a year ago, I built my pc with the following specs https://pcpartpicker.com/list/zZ9dCd

After seeing Fractal release the ridge and terra I fell in love with the aesthetic of both and wanted to downsize my system to either of the cases, but i want to make sure i change or upgrade any parts I need. I have been lurking in this sub for a while now and decided to pull the trigger on a corsair sf750 that will be swapped with the psu i currently have. My storage is a major reason for writing this post since I am dreading having to open up my system later on to add more, and cpu cooler has been a problem because of my motherboard.

Basically whats the best way to change my stock intel cooler to something that would preform better in a fractal ridge or terra.

For ssd I have been looking at using a 1tb WD black sn770 as the main drive and a 2tb silicon power ssd in my other m.2 slot. Would these be a good choice together or is there something cheaper or better?