So my s5 has about had it. It gets really hot after normal use and I have to constantly keep charging it throughout the day. I've never been able to play games or watch videos for extended periods of time. After buying two replacement batteries for it, I'm looking to upgrade with $500 to spend. I really want something quick (4gb of RAM or more), capable of expanded storage, and a battery that can make it through the day. I've been looking at the one plus line of phones (3t or 5t) and they seem to fit everything except lacking external storage. If you folks could steer me in the right directions I'd appreciate it. Thanks

Edit: service Cricket (which runs on AT&T) in the USA