PC Upgrade (Need advice)

[Badawy]

Hello, I need some advice for my PC upgrade I am working on. My current specs are:
CPU: AMD 4650g PRO
GPU: ASUS TUF OC 3070 Ti
Motherboard: B450 AORUS ELITE
Case: Antec NX292
PSU: 650W
RAM: DDR4 Aorus 3333 mT (~10.5 ns absolute latency) (2x8)

My issue is that my current CPU is bottlenecking my GPU significantly, and so I was planning on upgrading to the 5800x3d, as well as adding an additional 16g of ram. After some research however, I have decided to instead upgrade to the 7800x3d, alongside the following changes:
CPU: AMD Ryzen 7 7800x3d
Motherboard: ASUS ROG STRIX B650E-F Gaming Wifi
RAM: Corsair DDR5 6000mT (10 ns absolute latency) (2x16)
AIO Cooler: CORSAIR iCUE Link H150i (I understand it is slightly overkill, but as this CPU is meant to last a long time, I want to extend its life, moreover it is within my budget. I also live in a hot country, so its being overkill might just be enough for it to handle the hot temperatures)

I am planning on getting the 7800x3d rather than the 5800x3d to future-proof, in that it will allow me to upgrade the GPU in the future without also upgrading the CPU, and if the new generation of GPU's follows the same trend of the recent generations, I am hoping this will be sufficient enough to handle high-end future Nvidia 50 series GPU's, similar to how the 5800x3d can handle high end GPU's in the Nvidia 40 series. Moreover, bundles and deals will allow me to have a difference of only $200 between getting the 5800x3d and the 7800x3d including every component such as cooler, motherboard, and RAM for either setup, meaning that for $200, I can have a much better CPU, capable of handling any GPU upgrade I throw at it, as well as access to the new gen of technology such as DDR5 memory, storage, and GPU's. So, my two main questions are:
a. Is my future-proofing logic sound? Or should I just stick to the 5800x3d?
b. In the case where I get an AIO cooler, should I install a 240mm exhaust at the top, or a 360mm intake in the front (this is due to compatibility of my case). Keep in mind this is a mid-range case, so airflow is decent but not high-end. I would rather the 360mm at the front as it would allow me to showcase the very nice Corsair fans, and will provide the CPU with better cooling, but it might be at the cost of the GPU. What do you think?