Yeah, if I was deity I'd get rid of the whole heaven and hell thing. They both sound terrible to me. But I'd keep death, since it seems like a pretty good idea.
And while I personally prefer the idea of oblivion, I know others have their own hopes for the afterlife, so I'd probably try to have it all. The main thing would probably be a cross between limbo/heaven/Sigil, where everyone would come at first and from there move to their afterlife of choice, or they could just stick around if they wanted. Everyone would be invited to stay, from Hitler to the Dalai Lama, but if anyone tried to start some shit, angel bouncers would escort them off the premises or whatever.
And, as I said, for anyone who doesn't want to hang out there for eternity, more traditional afterlives would be on table: if you want be reincarnated, go ahead; if you want your own special heaven, assuming I have infinite space, go ahead and take it, I don't care. Want be absorbed into some sort mass consciousness or whatever? Go right ahead. want to be a ghost or some sort of ancestor spirit? So long as you don't cause too many problems for the living, I say go right ahead. Tired of the whole idea of existence and just want oblivion? Well, with the mass consciousness thing I'd say you have another alternative to the burden of eternal individual identity thing, but if that's what you really want, I'm not going to stop you.
And if your particular afterlife path isn't suiting you, you'd be free at any time to choose another. I'm okay with whatever. Though I probably wouldn't want to run the place. Would probably need to get some sort of celestial bureaucracy in place to handle all this for me.