Another thing I highly recommend is having a spare SSD ready with an OS installation of your choice for a rainy day. Sooner ...
I wasn't sure where a Macrium Reflect praise post would go, so here I am. Specifically, the rescue USB that one can create so that a borked upgrade clone from HDD to SSD is not a major worry. thanks ...