Think further and far ahead. You need future-proof your rig.
Broadband Network speed and Storage (Redundancy) technology usually remain static for years, you could spend heavily on this, reap its benefits in the long run.
Running a NAS server pc with good CPU with docker system, provide network storage for your pc, notebooks and mobile, or even cctv/webcam. Since this rig likely 365days x 24hrs, get a multi-bay mATX chassis but using 2U PSU under 300W, low watt CPU.
Your regular pc should be a notebook with your specific need, good gpu for games, or powerful cpu for heavy computing.
Sample Chassis: