Question Prebuilt Lenovo Legion T530 GPU Upgrade Question

Oct 30, 2020

I recently bought a Lenovo Legion T530-28ICB model with the following prebuilt specifications:
CPU: Intel Core i5 -8400 @2.8 Ghz
8 GB Ram
7200 RPM HDD
GPU - Nvidia GTX 1050 TI
Liteon PSU 280W

I then for bought a 1 Tb Samsung 860 SATA SSD, 8 GB RAM - Corsair Vengeance, a new PSU - Seasonic S12III-650, 80+ Bronze, 650W and a new GPU - Nvidia RTX 2060 (Gigabyte Windforce OC 8 GB (aprox. 330 EUR).
I am kind of disappointed with the GPU, I use this pc for Photo and Video Editing and casual gaming, I tried playing on my LG Oled with HDR on some games at 1440p with variable frames (Marvel Avengers, Forza 4) and I hit an average of 50 FPS on Marvel and 100 Fps on Forza 4 with maximum settings. I realized that I am in the window of 14 days to return the GPU and buy another one. I am thinking of buying an RTX 3070 which will be a huge difference (if i will be able to get one hopefully) the retail price for preorders here is around 600 Euros. I am not sure if 3070 will work on this PC or if it will be to much (for the motherboard that i really dont know if it is reliable). I think the PSU is ok for powering 3070 and i also dont know if i should change the CPU and if it is possible to put an i7 gen 9. Could you advise please if i should stick with current configuration or if i could swap the gpu with 3070 and be ok?

Kind regards,