Hey peeps, got a interesting thought on upgrading my water cooling loop. I need to fix a misconfiguration either or (just noticed CPU block in/out is swapped) and do something about my bad GPU temps ( 76C Package, 96C+ Hotspot, playing Honkai: Star Rail, 102C+ if icue forgets to load my fan profiles ). Either or I want to throw out these aging slim EK rads I currently have and throw in better performing rads since everywhere I read I see these EK rad are major under performers. (5 years old now as well) They were just easy to buy when I was entering my first open loop years ago.
Case: Corsair icue 7000X
Current:
Intake - EK Slim 480 (30mm), Push/Pull (4x120mm pull, 3x140mm push since they were include with case)
Exhaust - EK Slim 360(30mm), Push (3x120mm)
All fans are Corsair icue link QX RGB Fans

Future?
Choice 1: Thicker but loose one fan slot on exhaust. Pressure drop total is about 1.31PSI for this config per Tech Powerup
Intake - Corsair XR7 480 (54mm), use current Push/Pull or swap to incoming Corsair MAX RX RGB Fans to make all sides match at 4 fans a piece
Exhaust - Corsair XR5 240 (30mm) must use a 240 in this configuration due to conflicts in top right corner with thicker rad

Choice 2: Keep current config but thickness remains at 30mm across the board. Pressure drop total is about 1.94PSI
Intake - Hardware Labs GTS 480 (30mm); again current Push/Pull or upgrade to match later (Corsair has no XR5 480 option)
Exhaust - Corsair XR5 360 or Hardware Labs GTS 360 (same thing), reuse 3x120mm Push Config

Any thoughts on the two future choices? I am leaning towards #2 only due to the fact I have "heard" more surface area/fans is better.
Thanks!