Apple Watch series 4 battery drain after watchOS 7

I have done everything that Apple suggested to do when it comes to trying to solve this issue. Unpair it, pair it, reset to factory, turn off all applications, you name it. I can’t go back to watchOS 06 when my watch used to work for 17 hour normally now it’s 6 hours at most. I use this device to keep track of my fitness goal and now it’s constantly in the charger. The worst part is the more times you charge this battery the less battery life you will get out of this product in the end. If anyone has solve this issue other than buying a new watch (which after spending so much money for something that won’t last this long is an abuse to Apple consumers) please respond. I am very un sastified with apple and I hope they get this fixed.