Don’t forget the afterlife of Tantalus, or Sisyphus, the former condemned to reaching for fruit that would move out of his grasp, and latter condemned to pushing a boulder up a hill, only to see it fall back down.
That is right there were some special cases generally reserved for some sort of impiety or direct insult of a God.
But the two you mention must not have been the typical “shade” either since they apparently were corporeal enough to have thirst and push a big rock.