As a fellow 1070 8GB user, I am in the same boat myself.
I believe you should wait for the newest 7700 XT and 7800 XT GPUs from AMD. One possible side-effect would be that Nvidia would be forced to cut prices for 4060 and 4070.
Then you can go ahead and make the best possible choice as per your budget.
My advice would be to save some more money, wait for some time and build a new system.
Note: The newest GPUs use the PCIE 4.0 interface. Not really sure if your motherboard is able to handle that.
Sony clarified that this is because of them losing the license rights to the music in the trailer.
https://insider-gaming.com/kotor-remake-trailer-sony/