I think the Fediverse should be seen as two distinct parts: one that hosts user accounts and provides a user interface, and one that publishes content and provides discussion space.
Ideally, the first would remain independent from major companies, while the second would become universal for all web content.