Flash is really closing in on disk, though. If costs continue to halve biannually, and capacities keep rising like they do, they might intersect around 12 - 16TB in five to ten years.
Problem with Flash is the more you pack in same volume the more of it comes out bad, while the rest is fragile ticking bomb.
Replacing slow, but reliable HDD with 100 writes limited flash is not the answer.
I would be willing to wager that new models of laptops in 2020 with spinning disk will be uncommon, and, by 2023, except for niche verticals. basically non-existent. Same for Desktop 2 years later in each category.
2025 will mark the end of consumers buying spinning disk.
How about more like 2015. You're already forgetting MacbookAir/Chromebook/Ultrabook crowd are slowly taking over (which have no spinning disks).