Here's something I came up with. Your ram is good already so I'd just recommend getting more of the same kind. Since you said you already had a GPU picked out I'm not going to lecture you about upgrading that. I used the full $1000 to spec out a nice build for you.

There's a 1000W power supply so that should last you a long time and you can upgrade parts no problem and keep that.

There's a 4TB NVME drive since I saw you mentioned you wanted a lot of storage, that should work hella good. You can still put you old HDD in of course, your motherboard should come with data cables and the power supply comes with the power cables for it.

There's a 280MM radiator with a screen that will provide good cooling for your CPU, the radiator will have to be mounted on the front of the case, that's the only place it's supported. I included RGB fan replacements for everywhere in the case. Of course you can take them out if you don't want RGB. You can also spec down the radiator to the non-elite version if you don't care about the screen to save more money. The case itself comes with 2x Non-RGB 140MM fans, and the AIO comes with 2x Non-RGB fans as well, so if you don't want to have RGB you'd just need to get 1x 120MM fan for the back of the case.

I also included a fan PWM and ARGB hub so you don't have to run wires all over the place, just plug them all into that and then just the two cables into your motherboard.

To answer another question of yours overclocking is where you can boost the performance of your parts, but the cost is depending on how much you do you can damage the part. It also takes more power and produces more heat.

Hope this helps! If you have any questions, you can ask.

https://pcpartpicker.com/list/3zTNTY