I share your sentiment about Google. They look like they only do the minimal effort possible for Android not to die -- and since they get a lot of user data and ad revenue, they're not trying very hard since they're not taking hits in the wallet. That's not good enough for me, and IMO many other people. I personally have been witness to 3 tech-savvy businessmen who were excited to support Android finally give up and go full Apple. It was a pretty sad story listening to their motivation but I can't blame them because I found myself in 99% agreement with them.
I have the Exynos S7 Edge which for me is pretty much the one and only Android device which is close to perfect. I plan holding on to it until I see something that really excites me, until the release of iPhone 7s / 8 that is. If I like the 7s / 8 I'll just buy that and honestly call it quits with smartphones for at least 2 years.
Had enough of being milked for money for practically no upgrades at all for quite a while. Only Samsung and Apple are really trying -- mostly in the internal storage space.