I'm on the same path. I even faced very similar problems. To avoid software failures, I keep two different browsers and two for mapping, OsmAnd and Organic Maps

I'm on the same path. I even faced very similar problems. To avoid software failures, I keep two different browsers and two for mapping, OsmAnd and Organic Maps. And to not bother others in my household, I implement the measures only for myself, so no things like the PiHole. These both reduce friction and bring peace of mind.