Got an OMBAR 2800mAh from Amazon: https://www.amazon.com/gp/product/B07B7DTD8R/ref=ppx_yo_dt_b_asin_title_o07_s00?ie=UTF8&psc=1
Awesome! I thought about upgrading too, but after the new battery (OMBAR 2800mAh) and the factory reset it's looking like I can hold onto it a while longer.