Finally caved and upgraded to Spotify Family. Some of the CDs are not available, and agree with @rlb hate the UI.
Good point on S2 > S1, will start combing for used gear.
No Apple but have an older Widows 10 box, so I guess that will work. So the answer is external storage, cloud or both. Is...