During the past few days, I migrated most of my data from iCloud and cloud services to self-hosted services.

That's one important first step. The next step is to not replace existing Apple devices with new Apple devices.