I can heartily recommend a Fairphone to anyone bothered about the plight of workers in war-torn Congo. They have a new on coming out next year which I'm hoping will be Lollipop. (Current version is stuck on 4.2, which is a shame, but still totally workable.)
Also I think Intel is getting is stuff conflict-free.
Yeap, I think that's the right attitude. I only got a Fairphone after my previous phone died in a freak punting accident†.
Fairphone did have a recent announcement that was suggestive of new OSes... but personally I think them supporting Android is important, so it can be an off-the-shelf replacement for another phone, rather than a bizarro thing for beardy-weirdy yoghurt knitters.
Also I think Intel is getting is stuff conflict-free.