I just upgraded my 13" 2015 Macbook Pro's SSD from 256GB -> 1 TB for ~100 USD. With 16 GB of RAM, a great keyboard that's given me no issues, recently replaced screen lamination under warranty, and now a faster and larger SSD, I see absolutely no reason to upgrade to the new generation of Macbooks in the next few years.