As I am sure you know, you might consider an exterior HD rather than necessarily tying your storage to your PC. I have always had a USB HD to use anywhere I needed.
bernie I have a 1TB external here always for backup ....
having 500G-2Tb today is normal on a Pc..