@sounddrill@infosec.exchange When something isn't on OSM, I reach for Google Maps too But only through Tor Browser, without a Google account, and without giving it location access. You don't need Play Services for that, I do it on my LineageOS phone.
I'm glad you're actively contributing to OSM. We need more people to do that, if we want to make OSM a reliable alternative to Google Maps.
Also, migrating from Organic Maps to CoMaps is a one-minute thing, I think? "Export all bookmarks and tracks" in one, "Import all bookmarks and tracks" in the other