Yeah Nextcloud definitely. If you are considering moving away from Google, then make it an opportunity to move to open source and self-hosted and private!