If your wanting to switch for privacy reasons I would go for a Pixel and put a custom ROM on it.

Is there a reason you are tied to the idea of it being a flagship? I’ve been using the A series of Pixels forever and love them.

I only used Organic Maps for a few months before switching. Comaps has been adding a lot of stuff at a pretty rapid pace. Overall I find it to be a better experience. I can’t tell you anything about what went down with Organic Maps.