it is a logical step that you change the gpu, I would do the same if the problems were unbearable
. i solved my problems with gpu for now . had same problems with crashing wattman. few black screens . but i changed older r5 2600 with b450m , where i don`t have ANY sort of problems with 5700xt, it is interesting. few days ago exchanged board and cpu, some black screens in idle with firefox , and you know the rest of the story.