Should I stick with the N5 for another year? Or upgrade to one of the incoming nexus?

I have a Nexus 5 (16gb) since december 2013.
The battery life isn't amazing, and the limited storage & ram are bothering me sometimes.
But other than that - it works pretty well till now, and i'm satisfied with the 1080p resolution.

Should I spend 500$+ on a new nexus? just for more storge & ram (and more of "Google's support" maybe)?