@dansup If the storage problem is really going to drive you bonkers, then I think you’ve already made the decision. 🤣
There are some tax advantages (we’re both in 🇨🇦) to buying a computer in the last days of the year, so that’s worth considering.
Don’t forget to check the Apple refurb store- same warranty, less expensive.
I lease my machines, which is also handy, by making hardware upgrades regular.