Heyyo, OnePlus 5t as long as it doesn't have the intverted screen / jelly screen issue.
Guaranteed since it's a OnePlus that it'll have good developer community support.
OnePlus One released on KitKat and community developers are preparing builds for Oreo. That's amazing stuff for long term support