I think returning in its current state from BotW is just fine. Stamina management in that game worked fine as a way of making the certain areas require more commitment and planning to attack. The last thing it should do is go back to how it was handled in SS, where it was handed incredibly poorly.