Yes. I said it. Hate me if you wish.
I say if you time your death/return wrong, bummer for you. Tough. You wanna get out of hell with full energy, use a card.
What prompts this is most that it is so, well, buggy. Considering that it even feels a bit inconsistent. I say simplify the process: You get out of hell by squishing grapes or using a card. That's it. If you squish grapes, you come out tired. If you are in hell during New Day, bad on you for not planning.
(In fact make a quest to specifically SPEND the new day change in hell to show folks what happens.)
(This will be my most disliked idea. I know. It's no 'Meat Bricks.')