An unrelated suggestion but I would absolutely spend some money on a 1 or 2tb M2 SSD and clone your boot HD over to that. They aren't that expensive and an SSD is so much nicer for a boot drive. Might ...