Me too! We are a rare breed. I had a Nexus 6P until it got that unbearable battery issues (randomly dying @ 89%). Ended up reverting back to my previous upgrade, the one plus 2. It's a shame how quickly the XDA community jumps from one device to another.. I can't keep up with all the new models, price-wise. It's like the month after I just spend $700 on a brand new phone.. another flagship comes out, decimates the activity in my current phone & leaves me scrapping around for a decent stable & working ROM. If only I had the extra cash lying around to upgrade as fast as the XDA developer community does.. Until then, I'll be sluming it in the old sections trying to work out a daily driver.
Sorry for the off-topic rant.. had a few too many & I really had to put that out there..
Then why don't you build your own ROMs?