I think the new expansion helps a lot with the rebuild issue, since you're expected to have have many different bases on different planets instead of just one big base.