Time to let go. Recommendations for a replacement? So after replacing the battery a year and a half ago, shenanigans are back (35% then shut down). Rather than throw any more money at it (and the fact there's no escaping the lag) I'm looking at jumping ship.

Basically I want the exact same phone (big oled-type screen, stereo speakers, good camera and headphone jack if at all possible these days) but with a RAM upgrade (at least 8GB - this is the biggest failing of the Nexus and Pixel line). 

Any recommendations? I can't really wait until the new batch of phones coming this fall anymore.