My setup is actually now much easier and faster to use. It took me 1 month of setting everything up, but I love it.
My only "problem" is now my mobile device. I still have an iPhone X but would like to replicate the same "ownership" feeling I have on the desktop.
I was giing through Android phones which are:
* rootable
* have a SD card
* have a headphone jack
The only phone I found was the Sony Experia 1 iii. Bow I wonder what other geeks are using?
You can consider the idea of not using a phone at all, which may be the most aligned with what seem to be your values regarding tech. If you don't, then look into phones on which you can install LineageOS or even PINEPHONEs.
Mental Outlaw[1] has some helpful videos on YouTube on some of these topics.
It let me put my own library of Blu-Rays I ripped myself, as well as music I purchased over the years (many CDs I ripped myself), and more recently purchased through Bandcamp. Having it easily accessible from anywhere is good enough for me.
For mobile apps, I prioritize apps that are published on F-Droid, and will fallback on closed-source apps if nothing fit my requirements.
If you want a pocket device that truly gives you the same feeling as your desktop, and is immensely practical at the expense of not having mobile phone access, I can fully endorse the GPD Micro PC. Since I got mine, the phone only gets used for phone calls, navigation, and photography. I generally keep the phone on hotspot when I go out so the Micro PC has connectivity.
Some day I'll be forced into a smart phone, but it hasn't happened yet. When it does, I hope that phone is running Genode or Fuchsia.
For cloud services I use: Migadu (email), Nextcloud (Caldav, Carddav, Photos/files sync), Spotify. Most of my instant messaging is thru Signal, I think Matrix is too "out there" for my friends and family.
It all works wonderfully well. At some point, I might upgrade to iPhone 13 or 14 (whichever one they just announced), though I don't really need to. For e-mail, I just use the default Mail app. The battery life on this thing, after ~4 years, is surprisingly great. The Settings app has a menu that tells me my battery holds up to ~89% charge. Good enough I think.
What I really like about the AirPods is I can really easily switch between my MacBook and my iPhone. And the one time I misplaced them (leaving them in the office), I was able to quickly figure out where they were using the Find my app.