I'm going to upvote the suggestion to skip steps 11- 16 too.
Some things to look out for:
- Both the battery adhesive strips broke off for me so I had to pry the battery out. You do have to be careful as a good amount of pressure is needed to remove the battery that you don't twist the top display and break the connectors. It's just a trade-off of risks though - you won't have to worry about losing or inserting the wrong screws for the front panel connectors either.
- The metal connector over the touch ID button is hard to put back in. It looks like one piece on the video but it's a separate metal piece that goes over the connector.
- To open the case with the suction cup, I found it useful to place the cup more to one side, and lift that side up first and then work on the other side.