I also did a factory reset on my Oasis 2, I also did the recalibration of letting the battery drop to about 2%, neither made much of a difference. Only shutting the screen off before I closed my magnetic cover made a small difference of not losing 2% while sleeping. Which does add up over charging periods.
I wish you luck on getting a better Oasis 2. I also have the 32 gb. It was supposed to last a long time, being top end and all. I just charge the heck out of it, knowing I'm probably murdering the battery. At this point I don't care, lesson learned kind of thing. I won't get another Oasis 3 or whatever they come out with next, unless they address the battery issues. It only works well at the lowest light levels and is terrible for audio too. I cope by leaving only the battery symbol on.
The Forma is another top end device, that has problems. I'm now thinking perhaps less is more. Going with the less expensive devices might be the way to go. My hope is that the new Paperwhite 4 will be problem free. If it is and they continue to add improvements, I'm hoping for buttons at some point, I'm in !