Just finished this upgrade. Thanks to @
Acree for the write up and to everyone else for the helpful tips. I ended using the soldering iron to smooth over the section that the heat sink was hitting. Very easy upgrade, just very time consuming for a first timer. Cheers.