How old is your Surface totalloser1977?
It's not your battery that's at EOL. A whole stack of Surface devices suddenly and simultaneously unable to retain charge while off is not a "your battery is at EOL.
No, this is a Surface or Windows issue ... yet another Surface issue.
As I have said on many occasions, I am willing to provide my Surface to MS to facilitate analysis of this problem. It is not sufficient to reinstall everything, the problem to persist, and conclude you have to buy a new battery. This because you are installing exactly the same drivers and OS that are potentially contributing to the fault in the first instance. The logic just is not sound.
This is a serious issue and it requires an Engineering assessment.