My solution: don't upgrade it and focus on the stuff you can get.
I'd like to remind people that in earlier seasons, collecting the final building from the album was only possible if you completed all event tracks and the MP. That was also only attainable if you spent hours doing additional tasks or building and then demolishing (omega) residential zones - or if you paid hefty sums each week if you weren't willing to do that.
The full-album buildings were never easily obtainable. This hasn't really changed. I'm not having a hard time coming to terms with this, as it is how things always were.
People get so annoyed over not being able to get something that most of us (myself included) weren't really able to get before anyway in most cases. It's like everyone's looking at previous seasons through rose-tinted glasses.
Personally I find the current seasons much more relaxing. Can I get everything? No, but when was that ever a reality? Besides, the stuff I can get, I can get more easily now.