Good advice, I had the same issue with my Nexus 5 and Google ended support before I'd upgraded.

 

If anyone's interested I've opted for a Xiaomi Mi 5s plus for $344 through Shopmonk's eBay store. It shipped from Singapore today so should be here within the week.