Have not updated my S7 yet, nor my iPhone to 17. Keep hearing battery horror stories

Should I stay put or are the 10.1 for Apple Watch battery issues fixed?