I would not be against having short rest abilities (including the Warlock spell slots) recover after every combat (either automatically or with say a 1-5 minute real-time cooldown.
If those were my choices, I would much prefer they came back after each fight. Standing around for 5 minutes in a computer games seems really annoying.
Although, if they allow us to cheese combat like in DOS2, then it becomes a bit pointless, since you could just go and kill one enemy, run away, go back into the fight and kill another etc etc.
Full Warlock cheese party for run.
