@luciferMysticus Maybe you should consider an Android One / AOSP model as your next phone ?
So far some chinese brands seems to keep their phones update quite a longer time (Meizu, Xiaomi...)