Yea, a few hours is a bit much. I'd make it at least a full day. And not until the *next* night. If you die in the day you get all day, all that night, all the next day and rise at sundown.
If you die at night you are still dead that night, all the next day, and you rise at sundown.
That way...