If you can afford it, make your next phone a Google Pixel and put GrapheneOS on it. Despite the phone being google, all the google crap will be removed by the OS.

Nextcloud self-hosted to replace Google Drive.

Install as many apps as possible from F-Droid and the rest via Aurora Store.