Good morning! Sounds like a plan to me! Did you ever run the graphics card test??
I'm curious how that went!!
PS IF your CPU over heats, it might just need thermal paste; if the guy that built it didn't apply it right. Probably do the GPU also.
Lots of videos showing how to do that!