Well technically heaven and hell do not exist in traditional Hinduism, as with most religions it becomes modified or celebrated a different way (some Hindus believe in a Christian like heaven). The more times one is reincarnated the more one is not Enlightened with Brahman. Like you said once you reach moksha and become part of everything to some this is a "heaven". i hope that made sense.