I find this to be the biggest "fix" to a lot of abilities.Stop doing 5-minute-work-days and shield is perfectly fine.
In the last adventure I played in, we started things off at an inn. There were 2 social encounters, which revealed to us that it was run by werewolves. We had 2 combat encounters, plus a social encounter that revealed a shortcut to the BBEG. We took the shortcut with 1 more combat along the way. Against the BBEG, we couldn't nova, because we knew that we may have to fight our way back out (which we did). By the end, everyone was down to standard attacks and cantrips, because we couldn't even short rest once we killed the BBEG.