Great tutorial. The recommended T10 Torx Screwdriver was too big - I had to use a T9.
Also, it isn't necessary to unplug the optical drive thermal sensor connector socket on the logic board (Step 10), I just disconnected the optical drive thermal sensor from the drive (Step 17) before removing it.