Looks like it. But 5 years from now storage will be even cheaper.

At what $ per tb you think increasing the size is ok? We are roughly at $70 per 1TB SSD now I think.