I’d definitely swap as many parts in/out as possible before buying new stuff. Besides, you might end up finding out something just became unseated or unplugged - it happens over time. Just have some thermal paste handy before you start swapping CPUs.