Well, embarrassingly enough, it looks as though my problem SHOULD be solved. It is a Sunday (Australia) so finding heatsink is going to be tricky. I'll post again later to see if it fixes the issue. Thanks everyone.
what do you mean finding one ? you already have one. just pull it of, clean up, reapply thermal paste and re-seat the heat sink and fan.......... but do it right this time.