Now or wait?

I've had the 6 since Feb of 16, after the P had been out for several months. A carry over I purchased it on the Motorola site for $400 or a little less, can't find a record of it on the site since Lenovo took over. I like flagship features but dislike the money they get for them, I usually wait until the next series releases and snag the dethroned king of the hill. I don't do contracts. The current mid range phones seem to fall somewhat short of what I'm using, Amoled screen, speakers, resolution. My battery is still holding up pretty well, but I get the feeling it's beginning to tire. The phone fix guys say they can put a new battery in for $65 if it starts to fail, that's an option if I decide to hang on for a bit. I'd like to stay under $500, seems hard to do in the land of CDMA.

Hoping for some recommendations I haven't considered, tia.

to:)