System Crashes with new 5060ti OC

So I played this game for about 80 hours on my old system when I had a 3060 12gb and it ran just fine. I upgraded my system to a 5060ti oc 16gb and a ryzen 9 5950x. I haven't had ANY issues with any games at all other than Battlefield 6. This is the ONLY game in my library where if I switch screens; even in the main menu it loses display, hardlocks my system, causes it to go into failsafe mode and ramps up my fans to 100% so I have to shut it off via the PSU. 

They claimed they fixed this issue with the update 2 months ago, and said it revolved around large bodies of water. But it happens ALL the time, even just switching through menu options. Once again this is the ONLY game this happens in. I can sit here with Crimson Desert, WarDogs or Call of Duty running for hours with absolutely no issues. So I know for a fact it is not my system. 

I haven't been able to play in months due to the issue.