> I use OneDrive instead of Drive (I get 1TB thanks to the Office family plan), which is ok.

I just moved everything out of G Drive and iCloud and all of it into OneDrive. Super happy. Might look at Nextcloud or Carbonite though.